Ban synchronized method usage

Bug: 144692530
Test: gw lintDebug (datastore failing with jarjar, will see if
reproducible on server, happening in other lint check checkout
as well)

Change-Id: I0f5d5f8d63992edfa0bcb6b3fabae2b0d46e1f14
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 416f097..177561c 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -17,5 +17,6 @@
     <mapping directory="$PROJECT_DIR$/../../external/protobuf" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/../../external/webview_support_interfaces" vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../golden" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/ads/ads-identifier-benchmark/lint-baseline.xml b/ads/ads-identifier-benchmark/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/ads/ads-identifier-benchmark/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/ads/ads-identifier-common/lint-baseline.xml b/ads/ads-identifier-common/lint-baseline.xml
index a5dca43..e49f859 100644
--- a/ads/ads-identifier-common/lint-baseline.xml
+++ b/ads/ads-identifier-common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="PrivateConstructorForUtilityClass"
diff --git a/ads/ads-identifier-provider/lint-baseline.xml b/ads/ads-identifier-provider/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/ads/ads-identifier-provider/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/ads/ads-identifier-testing/lint-baseline.xml b/ads/ads-identifier-testing/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/ads/ads-identifier-testing/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/ads/ads-identifier/lint-baseline.xml b/ads/ads-identifier/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/ads/ads-identifier/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/appcompat/appcompat-resources/lint-baseline.xml b/appcompat/appcompat-resources/lint-baseline.xml
index bd5770f..4ad0055 100644
--- a/appcompat/appcompat-resources/lint-baseline.xml
+++ b/appcompat/appcompat-resources/lint-baseline.xml
@@ -1,5 +1,126 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        /**"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableContainer.java"
+            line="1128"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="89"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    public synchronized void setHooks(ResourceManagerHooks hooks) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="127"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    public synchronized Drawable getDrawable(@NonNull Context context, @DrawableRes int resId) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="131"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    synchronized Drawable getDrawable(@NonNull Context context, @DrawableRes int resId,"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="135"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    public synchronized void onConfigurationChanged(@NonNull Context context) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="158"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    private synchronized Drawable getCachedDrawable(@NonNull final Context context,"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="313"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    private synchronized boolean addDrawableToCache(@NonNull final Context context, final long key,"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="334"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    synchronized Drawable onDrawableLoadedFromResources(@NonNull Context context,"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="349"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    synchronized ColorStateList getTintList(@NonNull Context context, @DrawableRes int resId) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="377"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    public static synchronized PorterDuffColorFilter getPorterDuffColorFilter("
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
+            line="467"
+            column="5"/>
+    </issue>
 
     <issue
         id="KotlinPropertyAccess"
@@ -67,7 +188,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/content/res/AppCompatResources.java"
-            line="47"
+            line="66"
             column="19"/>
     </issue>
 
diff --git a/appcompat/appcompat/lint-baseline.xml b/appcompat/appcompat/lint-baseline.xml
index 3e23e65..58988e2 100644
--- a/appcompat/appcompat/lint-baseline.xml
+++ b/appcompat/appcompat/lint-baseline.xml
@@ -1,5 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    public static synchronized void preload() {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
+            line="58"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
+            line="462"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    public synchronized Drawable getDrawable(@NonNull Context context, @DrawableRes int resId) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
+            line="474"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    synchronized Drawable getDrawable(@NonNull Context context, @DrawableRes int resId,"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
+            line="478"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    public synchronized void onConfigurationChanged(@NonNull Context context) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
+            line="483"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    synchronized Drawable onDrawableLoadedFromResources(@NonNull Context context,"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
+            line="487"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    synchronized ColorStateList getTintList(@NonNull Context context, @DrawableRes int resId) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
+            line="497"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    public static synchronized PorterDuffColorFilter getPorterDuffColorFilter("
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
+            line="505"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatRatingBar.java"
+            line="59"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appcompat/widget/AppCompatSeekBar.java"
+            line="58"
+            column="5"/>
+    </issue>
 
     <issue
         id="KotlinPropertyAccess"
@@ -34,11 +144,11 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="141"
+            line="162"
             column="22"/>
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="161"
+            line="182"
             column="17"/>
     </issue>
 
@@ -1029,7 +1139,7 @@
         errorLine2="                              ~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="101"
+            line="102"
             column="31"/>
     </issue>
 
@@ -1040,7 +1150,7 @@
         errorLine2="                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="116"
+            line="117"
             column="26"/>
     </issue>
 
@@ -1051,7 +1161,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="121"
+            line="122"
             column="29"/>
     </issue>
 
@@ -1062,7 +1172,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="126"
+            line="127"
             column="12"/>
     </issue>
 
@@ -1073,7 +1183,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="130"
+            line="131"
             column="12"/>
     </issue>
 
@@ -1084,7 +1194,7 @@
         errorLine2="                                  ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="161"
+            line="162"
             column="35"/>
     </issue>
 
@@ -1095,7 +1205,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="231"
+            line="236"
             column="15"/>
     </issue>
 
@@ -1106,7 +1216,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="238"
+            line="243"
             column="12"/>
     </issue>
 
@@ -1117,7 +1227,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="238"
+            line="243"
             column="56"/>
     </issue>
 
@@ -1128,7 +1238,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ActionBarContextView.java"
-            line="359"
+            line="364"
             column="48"/>
     </issue>
 
@@ -4274,7 +4384,7 @@
         errorLine2="                                     ~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="109"
+            line="138"
             column="38"/>
     </issue>
 
@@ -4285,7 +4395,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="178"
+            line="199"
             column="32"/>
     </issue>
 
@@ -4296,7 +4406,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="184"
+            line="205"
             column="32"/>
     </issue>
 
@@ -4307,7 +4417,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="184"
+            line="205"
             column="43"/>
     </issue>
 
@@ -4318,7 +4428,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="190"
+            line="211"
             column="32"/>
     </issue>
 
@@ -4329,7 +4439,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="190"
+            line="211"
             column="43"/>
     </issue>
 
@@ -4340,7 +4450,7 @@
         errorLine2="                            ~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="237"
+            line="258"
             column="29"/>
     </issue>
 
@@ -4351,7 +4461,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="262"
+            line="283"
             column="35"/>
     </issue>
 
@@ -4362,7 +4472,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="542"
+            line="563"
             column="48"/>
     </issue>
 
@@ -4373,7 +4483,7 @@
         errorLine2="                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="575"
+            line="590"
             column="37"/>
     </issue>
 
@@ -4384,7 +4494,7 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="588"
+            line="603"
             column="12"/>
     </issue>
 
@@ -4395,7 +4505,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/app/AppCompatActivity.java"
-            line="617"
+            line="632"
             column="43"/>
     </issue>
 
@@ -4934,7 +5044,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="396"
+            line="465"
             column="32"/>
     </issue>
 
@@ -4945,7 +5055,7 @@
         errorLine2="                        ~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="405"
+            line="474"
             column="25"/>
     </issue>
 
@@ -4956,7 +5066,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="436"
+            line="505"
             column="32"/>
     </issue>
 
@@ -4967,7 +5077,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="437"
+            line="506"
             column="24"/>
     </issue>
 
@@ -5253,7 +5363,7 @@
         errorLine2="                                  ~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="187"
+            line="189"
             column="35"/>
     </issue>
 
@@ -5264,7 +5374,7 @@
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="225"
+            line="227"
             column="34"/>
     </issue>
 
@@ -5275,7 +5385,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="386"
+            line="388"
             column="12"/>
     </issue>
 
@@ -5286,7 +5396,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="398"
+            line="400"
             column="12"/>
     </issue>
 
@@ -5297,7 +5407,7 @@
         errorLine2="                                                   ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="398"
+            line="400"
             column="52"/>
     </issue>
 
@@ -5308,7 +5418,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="443"
+            line="445"
             column="54"/>
     </issue>
 
@@ -5319,7 +5429,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="497"
+            line="499"
             column="12"/>
     </issue>
 
@@ -6001,7 +6111,7 @@
         errorLine2="                                         ~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ContentFrameLayout.java"
-            line="78"
+            line="77"
             column="42"/>
     </issue>
 
@@ -6012,7 +6122,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ContentFrameLayout.java"
-            line="82"
+            line="81"
             column="35"/>
     </issue>
 
@@ -6023,7 +6133,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ContentFrameLayout.java"
-            line="177"
+            line="176"
             column="12"/>
     </issue>
 
@@ -6034,7 +6144,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ContentFrameLayout.java"
-            line="182"
+            line="181"
             column="12"/>
     </issue>
 
@@ -6045,7 +6155,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ContentFrameLayout.java"
-            line="187"
+            line="186"
             column="12"/>
     </issue>
 
@@ -6056,7 +6166,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ContentFrameLayout.java"
-            line="192"
+            line="191"
             column="12"/>
     </issue>
 
@@ -6067,7 +6177,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ContentFrameLayout.java"
-            line="197"
+            line="196"
             column="12"/>
     </issue>
 
@@ -6078,7 +6188,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/ContentFrameLayout.java"
-            line="202"
+            line="201"
             column="12"/>
     </issue>
 
@@ -6980,7 +7090,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java"
-            line="1798"
+            line="1784"
             column="29"/>
     </issue>
 
@@ -6991,7 +7101,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java"
-            line="1798"
+            line="1784"
             column="40"/>
     </issue>
 
@@ -7002,7 +7112,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java"
-            line="1835"
+            line="1812"
             column="29"/>
     </issue>
 
@@ -7013,18 +7123,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java"
-            line="1842"
-            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 LayoutParams(LayoutParams source) {"
-        errorLine2="                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java"
-            line="1852"
+            line="1819"
             column="29"/>
     </issue>
 
diff --git a/appsearch/compiler/lint-baseline.xml b/appsearch/compiler/lint-baseline.xml
new file mode 100644
index 0000000..2fdf963
--- /dev/null
+++ b/appsearch/compiler/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/appsearch/compiler/AppSearchCompiler.java"
+            line="58"
+            column="5"/>
+    </issue>
+
+</issues>
diff --git a/arch/core-common/lint-baseline.xml b/arch/core-common/lint-baseline.xml
index 3ad329f..5f3bddd 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 4.1.0-alpha08" client="gradle" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/arch/core-runtime/lint-baseline.xml b/arch/core-runtime/lint-baseline.xml
index de6cc5b..564832a 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/arch/core-testing/lint-baseline.xml b/arch/core-testing/lint-baseline.xml
index 7b590ef..c35342f 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/benchmark/common/lint-baseline.xml b/benchmark/common/lint-baseline.xml
new file mode 100644
index 0000000..c9cfbda
--- /dev/null
+++ b/benchmark/common/lint-baseline.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/benchmark/simpleperf/ProfileSession.java"
+            line="128"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/benchmark/simpleperf/ProfileSession.java"
+            line="148"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/benchmark/simpleperf/ProfileSession.java"
+            line="163"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/benchmark/simpleperf/ProfileSession.java"
+            line="174"
+            column="5"/>
+    </issue>
+
+</issues>
diff --git a/buildSrc-tests/lint-baseline.xml b/buildSrc-tests/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/buildSrc-tests/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/camera/camera-camera2/lint-baseline.xml b/camera/camera-camera2/lint-baseline.xml
index 4326545..93db88f 100644
--- a/camera/camera-camera2/lint-baseline.xml
+++ b/camera/camera-camera2/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="ObsoleteSdkInt"
diff --git a/camera/camera-core/lint-baseline.xml b/camera/camera-core/lint-baseline.xml
index 5ef941b..af37d4a 100644
--- a/camera/camera-core/lint-baseline.xml
+++ b/camera/camera-core/lint-baseline.xml
@@ -1,5 +1,467 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="61"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="66"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="72"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="77"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="82"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="87"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="92"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="107"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="112"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="117"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
+            line="130"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="51"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="74"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="101"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="106"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="111"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="116"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="121"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Nullable"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="126"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="132"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/AndroidImageReaderProxy.java"
+            line="144"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="63"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="69"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="74"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="79"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="84"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="89"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="95"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="101"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
+            line="107"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ImageAnalysisNonBlockingAnalyzer.java"
+            line="73"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ImageAnalysisNonBlockingAnalyzer.java"
+            line="82"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ImageAnalysisNonBlockingAnalyzer.java"
+            line="91"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/ImageAnalysisNonBlockingAnalyzer.java"
+            line="102"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/camera/core/ImageProxyDownsampler.java"
+            line="237"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/camera/core/ImageProxyDownsampler.java"
+            line="242"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/camera/core/ImageProxyDownsampler.java"
+            line="247"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @NonNull"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/SettableImageProxy.java"
+            line="66"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/SettableImageProxy.java"
+            line="76"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/SettableImageProxy.java"
+            line="87"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/SettableImageProxy.java"
+            line="92"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/camera/core/SingleCloseImageProxy.java"
+            line="36"
+            column="5"/>
+    </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
@@ -19,7 +481,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CaptureConfig.java"
-            line="305"
+            line="306"
             column="17"/>
     </issue>
 
@@ -41,7 +503,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="60"
+            line="59"
             column="28"/>
     </issue>
 
@@ -52,7 +514,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="60"
+            line="59"
             column="45"/>
     </issue>
 
@@ -63,7 +525,7 @@
         errorLine2="    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="70"
+            line="69"
             column="5"/>
     </issue>
 
@@ -74,7 +536,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="70"
+            line="69"
             column="42"/>
     </issue>
 
@@ -85,7 +547,7 @@
         errorLine2="                                                                           ~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="70"
+            line="69"
             column="76"/>
     </issue>
 
@@ -96,7 +558,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="80"
+            line="79"
             column="27"/>
     </issue>
 
@@ -107,7 +569,7 @@
         errorLine2="    ~~~~">
         <location
             file="src/main/java/androidx/camera/core/impl/CameraDeviceSurfaceManager.java"
-            line="108"
+            line="107"
             column="5"/>
     </issue>
 
@@ -448,19 +910,8 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/core/UseCase.java"
-            line="357"
+            line="395"
             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 VideoCapture(VideoCaptureConfig config) {"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/core/VideoCapture.java"
-            line="173"
-            column="25"/>
-    </issue>
-
 </issues>
diff --git a/camera/camera-extensions-stub/lint-baseline.xml b/camera/camera-extensions-stub/lint-baseline.xml
index de4a572..e75f740 100644
--- a/camera/camera-extensions-stub/lint-baseline.xml
+++ b/camera/camera-extensions-stub/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/camera/camera-extensions/lint-baseline.xml b/camera/camera-extensions/lint-baseline.xml
index 5fc13d5..9151302 100644
--- a/camera/camera-extensions/lint-baseline.xml
+++ b/camera/camera-extensions/lint-baseline.xml
@@ -1,258 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown 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 AutoImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/AutoImageCaptureExtender.java"
-            line="39"
-            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 AutoImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/AutoImageCaptureExtender.java"
-            line="39"
-            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 AutoPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/AutoPreviewExtender.java"
-            line="39"
-            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 AutoPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/AutoPreviewExtender.java"
-            line="39"
-            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 BeautyImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/BeautyImageCaptureExtender.java"
-            line="39"
-            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 BeautyImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/BeautyImageCaptureExtender.java"
-            line="39"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown 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 BeautyPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/BeautyPreviewExtender.java"
-            line="39"
-            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 BeautyPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                                               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/BeautyPreviewExtender.java"
-            line="39"
-            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 BokehImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/BokehImageCaptureExtender.java"
-            line="39"
-            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 BokehImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/BokehImageCaptureExtender.java"
-            line="39"
-            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 BokehPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/BokehPreviewExtender.java"
-            line="39"
-            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 BokehPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/BokehPreviewExtender.java"
-            line="39"
-            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 static boolean isExtensionAvailable(EffectMode effectMode,"
-        errorLine2="                                               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/ExtensionsManager.java"
-            line="151"
-            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="            Class&lt;?> klass, EffectMode effectMode, @CameraSelector.LensFacing int lensFacing) {"
-        errorLine2="            ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/ExtensionsManager.java"
-            line="175"
-            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="            Class&lt;?> klass, EffectMode effectMode, @CameraSelector.LensFacing int lensFacing) {"
-        errorLine2="                            ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/ExtensionsManager.java"
-            line="175"
-            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 HdrImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/HdrImageCaptureExtender.java"
-            line="38"
-            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 HdrImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/HdrImageCaptureExtender.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 static HdrPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/HdrPreviewExtender.java"
-            line="39"
-            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 HdrPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                                            ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/HdrPreviewExtender.java"
-            line="39"
-            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 NightImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/NightImageCaptureExtender.java"
-            line="39"
-            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 NightImageCaptureExtender create(ImageCapture.Builder builder) {"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/NightImageCaptureExtender.java"
-            line="39"
-            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 NightPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/NightPreviewExtender.java"
-            line="39"
-            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 NightPreviewExtender create(Preview.Builder builder) {"
-        errorLine2="                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/extensions/NightPreviewExtender.java"
-            line="39"
-            column="47"/>
-    </issue>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/camera/camera-testing/lint-baseline.xml b/camera/camera-testing/lint-baseline.xml
index 0078426..3bf2c97 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -8,30 +8,30 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="217"
+            line="252"
             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 detachUseCaseFromCamera(CameraInternal cameraInternal, UseCase... useCases) {"
-        errorLine2="                                               ~~~~~~~~~~~~~~">
+        errorLine1="    public static CameraUseCaseAdapter getCameraUseCaseAdapter(@NonNull Context context,"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="231"
-            column="48"/>
+            line="270"
+            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 detachUseCaseFromCamera(CameraInternal cameraInternal, UseCase... useCases) {"
-        errorLine2="                                                                              ~~~~~~~~~~">
+        errorLine1="    public static CameraUseCaseAdapter getCameraAndAttachUseCase(@NonNull Context context,"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/CameraUtil.java"
-            line="231"
-            column="79"/>
+            line="296"
+            column="19"/>
     </issue>
 
     <issue
@@ -41,7 +41,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="41"
+            line="42"
             column="27"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="45"
+            line="46"
             column="28"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="49"
+            line="50"
             column="28"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="53"
+            line="54"
             column="29"/>
     </issue>
 
@@ -85,40 +85,29 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="57"
+            line="58"
             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 setTag(Object tag) {"
-        errorLine2="                       ~~~~~~">
+        errorLine1="    public void setTag(TagBundle tag) {"
+        errorLine2="                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="65"
+            line="66"
             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/FakeCameraCaptureResult.java"
-            line="105"
-            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 notifyAllRequestsOnCaptureCompleted(CameraCaptureResult result) {"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java"
-            line="85"
+            line="86"
             column="53"/>
     </issue>
 
@@ -129,7 +118,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="45"
+            line="43"
             column="40"/>
     </issue>
 
@@ -140,7 +129,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="45"
+            line="43"
             column="57"/>
     </issue>
 
@@ -151,7 +140,7 @@
         errorLine2="            ~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="46"
+            line="44"
             column="13"/>
     </issue>
 
@@ -162,7 +151,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="58"
+            line="56"
             column="35"/>
     </issue>
 
@@ -173,7 +162,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="58"
+            line="56"
             column="52"/>
     </issue>
 
@@ -184,7 +173,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="63"
+            line="61"
             column="12"/>
     </issue>
 
@@ -195,7 +184,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="63"
+            line="61"
             column="49"/>
     </issue>
 
@@ -206,7 +195,7 @@
         errorLine2="                                                                                  ~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="63"
+            line="61"
             column="83"/>
     </issue>
 
@@ -217,7 +206,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="69"
+            line="67"
             column="34"/>
     </issue>
 
@@ -228,7 +217,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="98"
+            line="96"
             column="12"/>
     </issue>
 
@@ -257,22 +246,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 setTag(Object tag) {"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageInfo.java"
-            line="30"
-            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 setPlanes(PlaneProxy[] planeProxy) {"
         errorLine2="                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="138"
+            line="153"
             column="27"/>
     </issue>
 
@@ -283,7 +261,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="90"
+            line="98"
             column="12"/>
     </issue>
 
@@ -294,7 +272,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="108"
+            line="120"
             column="12"/>
     </issue>
 
@@ -305,24 +283,13 @@
         errorLine2="                           ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="165"
+            line="180"
             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="184"
-            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 static void waitForLooperToIdle(Handler handler) throws InterruptedException {"
         errorLine2="                                           ~~~~~~~">
         <location
diff --git a/camera/integration-tests/extensionstestlib/lint-baseline.xml b/camera/integration-tests/extensionstestlib/lint-baseline.xml
index a638cf0..7404c85 100644
--- a/camera/integration-tests/extensionstestlib/lint-baseline.xml
+++ b/camera/integration-tests/extensionstestlib/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -943,7 +943,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="173"
+            line="220"
             column="24"/>
     </issue>
 
@@ -954,7 +954,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="173"
+            line="220"
             column="41"/>
     </issue>
 
@@ -965,7 +965,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="174"
+            line="221"
             column="13"/>
     </issue>
 
@@ -976,7 +976,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="184"
+            line="231"
             column="12"/>
     </issue>
 
@@ -987,7 +987,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="190"
+            line="237"
             column="12"/>
     </issue>
 
@@ -998,7 +998,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="196"
+            line="243"
             column="12"/>
     </issue>
 
@@ -1009,7 +1009,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="207"
+            line="254"
             column="12"/>
     </issue>
 
diff --git a/collection/collection/lint-baseline.xml b/collection/collection/lint-baseline.xml
index f8d8e6b..e149a32 100644
--- a/collection/collection/lint-baseline.xml
+++ b/collection/collection/lint-baseline.xml
@@ -1,5 +1,104 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="284"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="293"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="302"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="310"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="318"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="325"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="332"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="339"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override public synchronized final String toString() {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/collection/LruCache.java"
+            line="347"
+            column="5"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/compose/test-utils/lint-baseline.xml b/compose/test-utils/lint-baseline.xml
new file mode 100644
index 0000000..68c1ec5
--- /dev/null
+++ b/compose/test-utils/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Synchronized"
+        errorLine2="        ^">
+        <location
+            file="src/androidMain/kotlin/androidx/compose/testutils/fake/FakeViewStructure.kt"
+            line="72"
+            column="9"/>
+    </issue>
+
+</issues>
diff --git a/concurrent/futures/lint-baseline.xml b/concurrent/futures/lint-baseline.xml
index 62a890d..d61f0dd 100644
--- a/concurrent/futures/lint-baseline.xml
+++ b/concurrent/futures/lint-baseline.xml
@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="                            @Override"
+        errorLine2="                            ^">
+        <location
+            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"
+            line="224"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/concurrent/futures/CallbackToFutureAdapter.java"
+            line="360"
+            column="9"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/concurrent/futures/src/main/java/androidx/concurrent/futures/lint-baseline.xml b/concurrent/futures/src/main/java/androidx/concurrent/futures/lint-baseline.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/concurrent/futures/src/main/java/androidx/concurrent/futures/lint-baseline.xml
diff --git a/contentpager/contentpager/lint-baseline.xml b/contentpager/contentpager/lint-baseline.xml
index 1c4febf..84ed07c 100644
--- a/contentpager/contentpager/lint-baseline.xml
+++ b/contentpager/contentpager/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/coordinatorlayout/coordinatorlayout/lint-baseline.xml b/coordinatorlayout/coordinatorlayout/lint-baseline.xml
index bee11dc..664ec78 100644
--- a/coordinatorlayout/coordinatorlayout/lint-baseline.xml
+++ b/coordinatorlayout/coordinatorlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/core/core-animation/lint-baseline.xml b/core/core-animation/lint-baseline.xml
index 751903d..f1b7cb3 100644
--- a/core/core-animation/lint-baseline.xml
+++ b/core/core-animation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="KotlinPropertyAccess"
diff --git a/core/core-role/lint-baseline.xml b/core/core-role/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/core/core-role/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/core/core/lint-baseline.xml b/core/core/lint-baseline.xml
index 089b267..337b1e8 100644
--- a/core/core/lint-baseline.xml
+++ b/core/core/lint-baseline.xml
@@ -1,5 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/core/widget/ContentLoadingProgressBar.java"
+            line="92"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/core/widget/ContentLoadingProgressBar.java"
+            line="118"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    private synchronized static File createFilesDir(File file) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/core/content/ContextCompat.java"
+            line="589"
+            column="5"/>
+    </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
@@ -63,7 +96,7 @@
         errorLine2="^">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="78"
+            line="80"
             column="1"/>
     </issue>
 
@@ -5199,7 +5232,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="703"
+            line="813"
             column="16"/>
     </issue>
 
@@ -5210,7 +5243,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="707"
+            line="817"
             column="16"/>
     </issue>
 
@@ -5221,1063 +5254,18 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="767"
+            line="878"
             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 Builder(Context context) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="799"
-            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 Builder setWhen(long when) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="807"
-            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 Builder setShowWhen(boolean show) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="816"
-            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 Builder setUsesChronometer(boolean b) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="845"
-            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 Builder setSmallIcon(int icon) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="872"
-            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 Builder setSmallIcon(int icon, int level) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="887"
-            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 Builder setContentTitle(CharSequence title) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="905"
-            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 Builder setContentTitle(CharSequence title) {"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="905"
-            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 Builder setContentText(CharSequence text) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="913"
-            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 Builder setContentText(CharSequence text) {"
-        errorLine2="                                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="913"
-            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 Builder setSubText(CharSequence text) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="927"
-            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 Builder setSubText(CharSequence text) {"
-        errorLine2="                                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="927"
-            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 Builder setRemoteInputHistory(CharSequence[] text) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="946"
-            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 Builder setRemoteInputHistory(CharSequence[] text) {"
-        errorLine2="                                             ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="946"
-            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 Builder setNumber(int number) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="956"
-            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 Builder setContentInfo(CharSequence info) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="964"
-            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 Builder setContentInfo(CharSequence info) {"
-        errorLine2="                                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="964"
-            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 Builder setProgress(int max, int progress, boolean indeterminate) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="973"
-            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 Builder setContent(RemoteViews views) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="983"
-            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 Builder setContent(RemoteViews views) {"
-        errorLine2="                                  ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="983"
-            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 Builder setContentIntent(PendingIntent intent) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="996"
-            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 Builder setContentIntent(PendingIntent intent) {"
-        errorLine2="                                        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="996"
-            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 Builder setDeleteIntent(PendingIntent intent) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1008"
-            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 Builder setDeleteIntent(PendingIntent intent) {"
-        errorLine2="                                       ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1008"
-            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 Builder setFullScreenIntent(PendingIntent intent, boolean highPriority) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1032"
-            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 Builder setFullScreenIntent(PendingIntent intent, boolean highPriority) {"
-        errorLine2="                                           ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1032"
-            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 Builder setTicker(CharSequence tickerText) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1043"
-            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 Builder setTicker(CharSequence tickerText) {"
-        errorLine2="                                 ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1043"
-            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 Builder setTicker(CharSequence tickerText, RemoteViews views) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1054"
-            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 Builder setTicker(CharSequence tickerText, RemoteViews views) {"
-        errorLine2="                                 ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1054"
-            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 Builder setTicker(CharSequence tickerText, RemoteViews views) {"
-        errorLine2="                                                          ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1054"
-            column="59"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Builder setLargeIcon(Bitmap icon) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1063"
-            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 Builder setLargeIcon(Bitmap icon) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1063"
-            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 Builder setSound(Uri sound) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1104"
-            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 Builder setSound(Uri sound) {"
-        errorLine2="                                ~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1104"
-            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 Builder setSound(Uri sound, @StreamType int streamType) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1127"
-            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 Builder setSound(Uri sound, @StreamType int streamType) {"
-        errorLine2="                                ~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1127"
-            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 Builder setVibrate(long[] pattern) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1150"
-            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 Builder setVibrate(long[] pattern) {"
-        errorLine2="                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1150"
-            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 Builder setLights(@ColorInt int argb, int onMs, int offMs) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1160"
-            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 Builder setOngoing(boolean ongoing) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1181"
-            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 Builder setColorized(boolean colorize) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1204"
-            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 Builder setOnlyAlertOnce(boolean onlyAlertOnce) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1214"
-            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 Builder setAutoCancel(boolean autoCancel) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1225"
-            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 Builder setLocalOnly(boolean b) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1236"
-            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 Builder setCategory(String category) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1248"
-            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 Builder setCategory(String category) {"
-        errorLine2="                                   ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1248"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Builder setDefaults(int defaults) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1265"
-            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 Builder setPriority(int pri) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1298"
-            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 Builder addPerson(String uri) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1327"
-            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 Builder addPerson(String uri) {"
-        errorLine2="                                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1327"
-            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 Builder setGroup(String groupKey) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1369"
-            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 Builder setGroup(String groupKey) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1369"
-            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 Builder setGroupSummary(boolean isGroupSummary) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1381"
-            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 Builder setSortKey(String sortKey) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1398"
-            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 Builder setSortKey(String sortKey) {"
-        errorLine2="                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1398"
-            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 Builder addExtras(Bundle extras) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1410"
-            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 Builder addExtras(Bundle extras) {"
-        errorLine2="                                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1410"
-            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 Builder setExtras(Bundle extras) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1433"
-            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 Builder setExtras(Bundle extras) {"
-        errorLine2="                                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1433"
-            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 Bundle getExtras() {"
-        errorLine2="               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1448"
-            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 Builder addAction(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1471"
-            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 Builder addAction(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1471"
-            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 Builder addAction(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="                                                               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1471"
-            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 Builder addAction(Action action) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1490"
-            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 Builder addAction(Action action) {"
-        errorLine2="                                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1490"
-            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 Builder addInvisibleAction(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1506"
-            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 Builder addInvisibleAction(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="                                                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1506"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Builder addInvisibleAction(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="                                                                        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1506"
-            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 Builder addInvisibleAction(Action action) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1519"
-            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 Builder addInvisibleAction(Action action) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1519"
-            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 Builder setStyle(Style style) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1532"
-            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 Builder setStyle(Style style) {"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1532"
-            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 Builder setColor(@ColorInt int argb) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1549"
-            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 Builder setVisibility(@NotificationVisibility int visibility) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1561"
-            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 Builder setPublicVersion(Notification n) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1574"
-            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 Builder setPublicVersion(Notification n) {"
-        errorLine2="                                        ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1574"
-            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 Builder setCustomContentView(RemoteViews contentView) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1585"
-            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 Builder setCustomContentView(RemoteViews contentView) {"
-        errorLine2="                                            ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1585"
-            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 Builder setCustomBigContentView(RemoteViews contentView) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1598"
-            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 Builder setCustomBigContentView(RemoteViews contentView) {"
-        errorLine2="                                               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1598"
-            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 Builder setCustomHeadsUpContentView(RemoteViews contentView) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1611"
-            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 Builder setCustomHeadsUpContentView(RemoteViews contentView) {"
-        errorLine2="                                                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1611"
-            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 Builder setChannelId(@NonNull String channelId) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1621"
-            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 Builder setTimeoutAfter(long durationMs) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1630"
-            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 Builder setShortcutId(String shortcutId) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1646"
-            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 Builder setShortcutId(String shortcutId) {"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1646"
-            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 Builder setBadgeIconType(@BadgeIconType int icon) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1703"
-            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 Builder setGroupAlertBehavior(@GroupAlertBehavior int groupAlertBehavior) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1718"
-            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 Builder extend(Extender extender) {"
-        errorLine2="               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1743"
-            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 Builder extend(Extender extender) {"
-        errorLine2="                              ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1743"
-            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 Notification getNotification() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1762"
-            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 Notification build() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1770"
-            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="        protected static CharSequence limitCharSequenceLength(CharSequence cs) {"
-        errorLine2="                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1774"
-            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="        protected static CharSequence limitCharSequenceLength(CharSequence cs) {"
-        errorLine2="                                                              ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1774"
-            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 RemoteViews getContentView() {"
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1786"
+            line="2342"
             column="16"/>
     </issue>
 
@@ -6288,7 +5276,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1794"
+            line="2350"
             column="16"/>
     </issue>
 
@@ -6299,7 +5287,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1802"
+            line="2358"
             column="16"/>
     </issue>
 
@@ -6310,40 +5298,18 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1859"
+            line="2416"
             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 setBuilder(Builder builder) {"
-        errorLine2="                               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1864"
-            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 Notification build() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1873"
-            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 apply(NotificationBuilderWithBuilderAccessor builder) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1889"
+            line="2453"
             column="27"/>
     </issue>
 
@@ -6354,7 +5320,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1896"
+            line="2469"
             column="16"/>
     </issue>
 
@@ -6365,7 +5331,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1896"
+            line="2469"
             column="44"/>
     </issue>
 
@@ -6376,7 +5342,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1904"
+            line="2477"
             column="16"/>
     </issue>
 
@@ -6387,7 +5353,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1904"
+            line="2477"
             column="47"/>
     </issue>
 
@@ -6398,7 +5364,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1912"
+            line="2485"
             column="16"/>
     </issue>
 
@@ -6409,7 +5375,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1912"
+            line="2485"
             column="51"/>
     </issue>
 
@@ -6420,40 +5386,18 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1921"
+            line="2493"
             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="        protected void restoreFromCompatExtras(Bundle extras) {"
-        errorLine2="                                               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1929"
-            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 RemoteViews applyStandardTemplate(boolean showSmallIcon,"
-        errorLine2="               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="1936"
-            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 Bitmap createColoredBitmap(int iconId, int color) {"
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2091"
+            line="2773"
             column="16"/>
     </issue>
 
@@ -6464,7 +5408,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2141"
+            line="2823"
             column="42"/>
     </issue>
 
@@ -6475,359 +5419,7 @@
         errorLine2="                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2142"
-            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 BigPictureStyle(Builder builder) {"
-        errorLine2="                               ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2208"
-            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 BigPictureStyle setBigContentTitle(CharSequence title) {"
-        errorLine2="               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2216"
-            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 BigPictureStyle setBigContentTitle(CharSequence title) {"
-        errorLine2="                                                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2216"
-            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 BigPictureStyle setSummaryText(CharSequence cs) {"
-        errorLine2="               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2224"
-            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 BigPictureStyle setSummaryText(CharSequence cs) {"
-        errorLine2="                                              ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2224"
-            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 BigPictureStyle bigPicture(Bitmap b) {"
-        errorLine2="               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2233"
-            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 BigPictureStyle bigPicture(Bitmap b) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2233"
-            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 BigPictureStyle bigLargeIcon(Bitmap b) {"
-        errorLine2="               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2241"
-            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 BigPictureStyle bigLargeIcon(Bitmap b) {"
-        errorLine2="                                            ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2241"
-            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 apply(NotificationBuilderWithBuilderAccessor builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2252"
-            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 BigTextStyle(Builder builder) {"
-        errorLine2="                            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2295"
-            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 BigTextStyle setBigContentTitle(CharSequence title) {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2303"
-            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 BigTextStyle setBigContentTitle(CharSequence title) {"
-        errorLine2="                                               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2303"
-            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 BigTextStyle setSummaryText(CharSequence cs) {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2311"
-            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 BigTextStyle setSummaryText(CharSequence cs) {"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2311"
-            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 BigTextStyle bigText(CharSequence cs) {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2321"
-            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 BigTextStyle bigText(CharSequence cs) {"
-        errorLine2="                                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2321"
-            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 apply(NotificationBuilderWithBuilderAccessor builder) {"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2331"
-            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 CharSequence getUserDisplayName() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2425"
-            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 Person getUser() {"
-        errorLine2="               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2430"
-            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 MessagingStyle setConversationTitle(@Nullable CharSequence conversationTitle) {"
-        errorLine2="               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2447"
-            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 MessagingStyle addMessage(CharSequence text, long timestamp, CharSequence sender) {"
-        errorLine2="               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2479"
-            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 MessagingStyle addMessage(CharSequence text, long timestamp, CharSequence sender) {"
-        errorLine2="                                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2479"
-            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 MessagingStyle addMessage(CharSequence text, long timestamp, CharSequence sender) {"
-        errorLine2="                                                                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2479"
-            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 MessagingStyle addMessage(CharSequence text, long timestamp, Person person) {"
-        errorLine2="               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2496"
-            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 MessagingStyle addMessage(CharSequence text, long timestamp, Person person) {"
-        errorLine2="                                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2496"
-            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 MessagingStyle addMessage(CharSequence text, long timestamp, Person person) {"
-        errorLine2="                                                                            ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2496"
-            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 MessagingStyle addMessage(Message message) {"
-        errorLine2="               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2508"
-            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 MessagingStyle addMessage(Message message) {"
-        errorLine2="                                         ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2508"
-            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 List&lt;Message> getMessages() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2519"
-            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 MessagingStyle setGroupConversation(boolean isGroupConversation) {"
-        errorLine2="               ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2529"
-            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="                Notification notification) {"
-        errorLine2="                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2574"
+            line="2824"
             column="17"/>
     </issue>
 
@@ -6838,7 +5430,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2596"
+            line="2935"
             column="27"/>
     </issue>
 
@@ -6849,162 +5441,30 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2752"
+            line="2955"
             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="        protected void restoreFromCompatExtras(Bundle extras) {"
-        errorLine2="                                               ~~~~~~">
+        errorLine1="        public void apply(NotificationBuilderWithBuilderAccessor builder) {"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2775"
-            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 Message(CharSequence text, long timestamp, @Nullable Person person) {"
-        errorLine2="                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2830"
-            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 Message(CharSequence text, long timestamp, CharSequence sender){"
-        errorLine2="                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2850"
-            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 Message(CharSequence text, long timestamp, CharSequence sender){"
-        errorLine2="                                                              ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2850"
-            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 Message setData(String dataMimeType, Uri dataUri) {"
-        errorLine2="                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2883"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Message setData(String dataMimeType, Uri dataUri) {"
-        errorLine2="                                   ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2883"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Message setData(String dataMimeType, Uri dataUri) {"
-        errorLine2="                                                        ~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="2883"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public InboxStyle(Builder builder) {"
-        errorLine2="                          ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3069"
+            line="3055"
             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 InboxStyle setBigContentTitle(CharSequence title) {"
-        errorLine2="               ~~~~~~~~~~">
+        errorLine1="        public void addCompatExtras(Bundle extras) {"
+        errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3077"
-            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 InboxStyle setBigContentTitle(CharSequence title) {"
-        errorLine2="                                             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3077"
-            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 InboxStyle setSummaryText(CharSequence cs) {"
-        errorLine2="               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3085"
-            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 InboxStyle setSummaryText(CharSequence cs) {"
-        errorLine2="                                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3085"
-            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 InboxStyle addLine(CharSequence cs) {"
-        errorLine2="               ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3094"
-            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 InboxStyle addLine(CharSequence cs) {"
-        errorLine2="                                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3094"
-            column="35"/>
+            line="3072"
+            column="37"/>
     </issue>
 
     <issue
@@ -7014,7 +5474,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3104"
+            line="3381"
             column="27"/>
     </issue>
 
@@ -7025,7 +5485,29 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3159"
+            line="3928"
+            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 addCompatExtras(Bundle extras) {"
+        errorLine2="                                    ~~~~~~">
+        <location
+            file="src/main/java/androidx/core/app/NotificationCompat.java"
+            line="3947"
+            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 apply(NotificationBuilderWithBuilderAccessor builder) {"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/core/app/NotificationCompat.java"
+            line="4028"
             column="27"/>
     </issue>
 
@@ -7036,7 +5518,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3170"
+            line="4039"
             column="16"/>
     </issue>
 
@@ -7047,7 +5529,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3170"
+            line="4039"
             column="44"/>
     </issue>
 
@@ -7058,7 +5540,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3187"
+            line="4056"
             column="16"/>
     </issue>
 
@@ -7069,7 +5551,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3187"
+            line="4056"
             column="47"/>
     </issue>
 
@@ -7080,7 +5562,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3208"
+            line="4077"
             column="16"/>
     </issue>
 
@@ -7091,7 +5573,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3208"
+            line="4077"
             column="51"/>
     </issue>
 
@@ -7102,7 +5584,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3389"
+            line="4261"
             column="16"/>
     </issue>
 
@@ -7113,1476 +5595,13 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3394"
+            line="4266"
             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 Action(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="                                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3396"
-            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 Action(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="                                                    ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3396"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public CharSequence getTitle() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3461"
-            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 PendingIntent getActionIntent() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3465"
-            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 Bundle getExtras() {"
-        errorLine2="               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3472"
-            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 RemoteInput[] getRemoteInputs() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3489"
-            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 RemoteInput[] getDataOnlyRemoteInputs() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3523"
-            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 Builder(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="                                     ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3570"
-            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 Builder(int icon, CharSequence title, PendingIntent intent) {"
-        errorLine2="                                                         ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3570"
-            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 Builder(Action action) {"
-        errorLine2="                           ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3586"
-            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 Builder addExtras(Bundle extras) {"
-        errorLine2="                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3618"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Builder addExtras(Bundle extras) {"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3618"
-            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 Bundle getExtras() {"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3630"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Builder addRemoteInput(RemoteInput remoteInput) {"
-        errorLine2="                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3641"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Builder addRemoteInput(RemoteInput remoteInput) {"
-        errorLine2="                                          ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3641"
-            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 Builder setAllowGeneratedReplies(boolean allowGeneratedReplies) {"
-        errorLine2="                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3658"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Builder setSemanticAction(@SemanticAction int semanticAction) {"
-        errorLine2="                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3671"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Builder setShowsUserInterface(boolean showsUserInterface) {"
-        errorLine2="                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3695"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Builder extend(Extender extender) {"
-        errorLine2="                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3704"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Builder extend(Extender extender) {"
-        errorLine2="                                  ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3704"
-            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 Action build() {"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3729"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            Builder extend(Builder builder);"
-        errorLine2="            ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3764"
-            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="            Builder extend(Builder builder);"
-        errorLine2="                           ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3764"
-            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 WearableExtender(Action action) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3817"
-            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 Action.Builder extend(Action.Builder builder) {"
-        errorLine2="                   ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3833"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public Action.Builder extend(Action.Builder builder) {"
-        errorLine2="                                         ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3833"
-            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 WearableExtender clone() {"
-        errorLine2="                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3854"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setAvailableOffline(boolean availableOffline) {"
-        errorLine2="                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3869"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setInProgressLabel(CharSequence label) {"
-        errorLine2="                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3902"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setInProgressLabel(CharSequence label) {"
-        errorLine2="                                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3902"
-            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 CharSequence getInProgressLabel() {"
-        errorLine2="                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3916"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setConfirmLabel(CharSequence label) {"
-        errorLine2="                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3930"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setConfirmLabel(CharSequence label) {"
-        errorLine2="                                                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3930"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public CharSequence getConfirmLabel() {"
-        errorLine2="                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3944"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setCancelLabel(CharSequence label) {"
-        errorLine2="                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3958"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setCancelLabel(CharSequence label) {"
-        errorLine2="                                                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3958"
-            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 CharSequence getCancelLabel() {"
-        errorLine2="                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3972"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setHintLaunchesActivity("
-        errorLine2="                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="3983"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public WearableExtender setHintDisplayActionInline("
-        errorLine2="                   ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4009"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        Builder extend(Builder builder);"
-        errorLine2="        ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4062"
-            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="        Builder extend(Builder builder);"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4062"
-            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 WearableExtender(Notification notification) {"
-        errorLine2="                                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4253"
-            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 NotificationCompat.Builder extend(NotificationCompat.Builder builder) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4306"
-            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 NotificationCompat.Builder extend(NotificationCompat.Builder builder) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4306"
-            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 WearableExtender clone() {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4411"
-            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 WearableExtender addAction(Action action) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4442"
-            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 WearableExtender addAction(Action action) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4442"
-            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 WearableExtender addActions(List&lt;Action> actions) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4459"
-            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 WearableExtender addActions(List&lt;Action> actions) {"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4459"
-            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 WearableExtender clearActions() {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4469"
-            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 List&lt;Action> getActions() {"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4477"
-            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 WearableExtender setDisplayIntent(PendingIntent intent) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4513"
-            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 WearableExtender setDisplayIntent(PendingIntent intent) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4513"
-            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 PendingIntent getDisplayIntent() {"
-        errorLine2="               ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4525"
-            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 WearableExtender addPage(Notification page) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4541"
-            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 WearableExtender addPage(Notification page) {"
-        errorLine2="                                        ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4541"
-            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 WearableExtender addPages(List&lt;Notification> pages) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4558"
-            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 WearableExtender addPages(List&lt;Notification> pages) {"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4558"
-            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 WearableExtender clearPages() {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4570"
-            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 List&lt;Notification> getPages() {"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4584"
-            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 WearableExtender setBackground(Bitmap background) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4599"
-            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 WearableExtender setBackground(Bitmap background) {"
-        errorLine2="                                              ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4599"
-            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 Bitmap getBackground() {"
-        errorLine2="               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4614"
-            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 WearableExtender setContentIcon(int icon) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4624"
-            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 WearableExtender setContentIconGravity(int contentIconGravity) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4648"
-            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 WearableExtender setContentAction(int actionIndex) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4676"
-            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 WearableExtender setGravity(int gravity) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4703"
-            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 WearableExtender setCustomSizePreset(int sizePreset) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4733"
-            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 WearableExtender setCustomContentHeight(int height) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4763"
-            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 WearableExtender setStartScrollBottom(boolean startScrollBottom) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4786"
-            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 WearableExtender setContentIntentAvailableOffline("
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4806"
-            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 WearableExtender setHintHideIcon(boolean hintHideIcon) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4830"
-            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 WearableExtender setHintShowBackgroundOnly(boolean hintShowBackgroundOnly) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4855"
-            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 WearableExtender setHintAvoidBackgroundClipping("
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4882"
-            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 WearableExtender setHintScreenTimeout(int timeout) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4912"
-            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 WearableExtender setHintAmbientBigPicture(boolean hintAmbientBigPicture) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4939"
-            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 WearableExtender setHintContentIntentLaunchesActivity("
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4964"
-            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 WearableExtender setDismissalId(String dismissalId) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4989"
-            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 WearableExtender setDismissalId(String dismissalId) {"
-        errorLine2="                                               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4989"
-            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 String getDismissalId() {"
-        errorLine2="               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="4998"
-            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 WearableExtender setBridgeTag(String bridgeTag) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5010"
-            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 WearableExtender setBridgeTag(String bridgeTag) {"
-        errorLine2="                                             ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5010"
-            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 String getBridgeTag() {"
-        errorLine2="               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5019"
-            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 CarExtender(Notification notification) {"
-        errorLine2="                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5096"
-            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 NotificationCompat.Builder extend(NotificationCompat.Builder builder) {"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5205"
-            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 NotificationCompat.Builder extend(NotificationCompat.Builder builder) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5205"
-            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 CarExtender setColor(@ColorInt int color) {"
-        errorLine2="               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5236"
-            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 CarExtender setLargeIcon(Bitmap largeIcon) {"
-        errorLine2="               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5260"
-            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 CarExtender setLargeIcon(Bitmap largeIcon) {"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5260"
-            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 Bitmap getLargeIcon() {"
-        errorLine2="               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5271"
-            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 CarExtender setUnreadConversation(UnreadConversation unreadConversation) {"
-        errorLine2="               ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5285"
-            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 CarExtender setUnreadConversation(UnreadConversation unreadConversation) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5285"
-            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 UnreadConversation getUnreadConversation() {"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5298"
-            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 String[] getMessages() {"
-        errorLine2="                   ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5331"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public RemoteInput getRemoteInput() {"
-        errorLine2="                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5339"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public PendingIntent getReplyPendingIntent() {"
-        errorLine2="                   ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5347"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="            public PendingIntent getReadPendingIntent() {"
-        errorLine2="                   ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5355"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown 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[] getParticipants() {"
-        errorLine2="                   ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5362"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown 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 getParticipant() {"
-        errorLine2="                   ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5369"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                public Builder(String name) {"
-        errorLine2="                               ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5396"
-            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 Builder addMessage(String message) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5408"
-            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 Builder addMessage(String message) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5408"
-            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 Builder setReplyAction("
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5424"
-            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="                        PendingIntent pendingIntent, RemoteInput remoteInput) {"
-        errorLine2="                        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5425"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                        PendingIntent pendingIntent, RemoteInput remoteInput) {"
-        errorLine2="                                                     ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5425"
-            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 Builder setReadPendingIntent(PendingIntent pendingIntent) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5439"
-            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 Builder setReadPendingIntent(PendingIntent pendingIntent) {"
-        errorLine2="                                                    ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5439"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                public Builder setLatestTimestamp(long timestamp) {"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5455"
-            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 UnreadConversation build() {"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5465"
-            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 Bundle getExtras(Notification notification) {"
-        errorLine2="                                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5857"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown 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 getActionCount(Notification notification) {"
-        errorLine2="                                     ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5871"
-            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 Action getAction(Notification notification, int actionIndex) {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5888"
-            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 Action getAction(Notification notification, int actionIndex) {"
-        errorLine2="                                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5888"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown 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;Action> getInvisibleActions(Notification notification) {"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5991"
-            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;Action> getInvisibleActions(Notification notification) {"
-        errorLine2="                                                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="5991"
-            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 CharSequence getContentTitle(Notification notification) {"
-        errorLine2="                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6011"
-            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 CharSequence getContentTitle(Notification notification) {"
-        errorLine2="                                               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6011"
-            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 String getCategory(Notification notification) {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6020"
-            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 String getCategory(Notification notification) {"
-        errorLine2="                                     ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6020"
-            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 boolean getLocalOnly(Notification notification) {"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6034"
-            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 String getGroup(Notification notification) {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6051"
-            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 String getGroup(Notification notification) {"
-        errorLine2="                                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6051"
-            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 isGroupSummary(Notification notification) {"
-        errorLine2="                                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6070"
-            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 static String getSortKey(Notification notification) {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6095"
-            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 String getSortKey(Notification notification) {"
-        errorLine2="                                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6095"
-            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 static String getChannelId(Notification notification) {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6111"
-            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 String getChannelId(Notification notification) {"
-        errorLine2="                                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6111"
-            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 static long getTimeoutAfter(Notification notification) {"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6123"
-            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 int getBadgeIconType(Notification notification) {"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6136"
-            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 String getShortcutId(Notification notification) {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6148"
-            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 String getShortcutId(Notification notification) {"
-        errorLine2="                                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6148"
-            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 int getGroupAlertBehavior(Notification notification) {"
-        errorLine2="                                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6178"
-            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 boolean getAllowSystemGeneratedContextualActions(Notification notification) {"
-        errorLine2="                                                                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/core/app/NotificationCompat.java"
-            line="6190"
-            column="68"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown 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
@@ -10941,7 +7960,7 @@
         errorLine2="                                                           ~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/TypefaceCompatApi29Impl.java"
-            line="101"
+            line="105"
             column="60"/>
     </issue>
 
@@ -10952,7 +7971,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/TypefaceCompatApi29Impl.java"
-            line="102"
+            line="106"
             column="13"/>
     </issue>
 
@@ -10963,7 +7982,7 @@
         errorLine2="                                                                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/TypefaceCompatApi29Impl.java"
-            line="102"
+            line="106"
             column="81"/>
     </issue>
 
@@ -10974,7 +7993,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/TypefaceCompatApi29Impl.java"
-            line="143"
+            line="151"
             column="13"/>
     </issue>
 
@@ -10985,7 +8004,7 @@
         errorLine2="                             ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/TypefaceCompatApi29Impl.java"
-            line="143"
+            line="151"
             column="30"/>
     </issue>
 
@@ -10996,7 +8015,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/androidx/core/graphics/TypefaceCompatApi29Impl.java"
-            line="143"
+            line="151"
             column="59"/>
     </issue>
 
diff --git a/cursoradapter/cursoradapter/lint-baseline.xml b/cursoradapter/cursoradapter/lint-baseline.xml
index 99cefe6..b95803b 100644
--- a/cursoradapter/cursoradapter/lint-baseline.xml
+++ b/cursoradapter/cursoradapter/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/customview/customview/lint-baseline.xml b/customview/customview/lint-baseline.xml
index 8cec1e7..147ca6c 100644
--- a/customview/customview/lint-baseline.xml
+++ b/customview/customview/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/docs-runner/lint-baseline.xml b/docs-runner/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/docs-runner/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/drawerlayout/drawerlayout/lint-baseline.xml b/drawerlayout/drawerlayout/lint-baseline.xml
index e7dc244..1f3b34f 100644
--- a/drawerlayout/drawerlayout/lint-baseline.xml
+++ b/drawerlayout/drawerlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -140,7 +140,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="1973"
+            line="1963"
             column="15"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="1978"
+            line="1968"
             column="15"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="1978"
+            line="1968"
             column="59"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="1987"
+            line="1977"
             column="41"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="1992"
+            line="1982"
             column="12"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="1992"
+            line="1982"
             column="56"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="1997"
+            line="1987"
             column="31"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="2062"
+            line="2052"
             column="43"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="                                        ~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="2071"
+            line="2061"
             column="41"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="2083"
+            line="2073"
             column="43"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="2114"
+            line="2104"
             column="15"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="2143"
+            line="2133"
             column="25"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="2143"
+            line="2133"
             column="48"/>
     </issue>
 
diff --git a/dynamic-animation/dynamic-animation/lint-baseline.xml b/dynamic-animation/dynamic-animation/lint-baseline.xml
index 589f0de..b27b439 100644
--- a/dynamic-animation/dynamic-animation/lint-baseline.xml
+++ b/dynamic-animation/dynamic-animation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -8,7 +8,7 @@
         errorLine2="           ~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="385"
+            line="391"
             column="12"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="           ~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="410"
+            line="416"
             column="12"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="           ~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="424"
+            line="430"
             column="12"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="           ~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="442"
+            line="448"
             column="12"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="           ~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="455"
+            line="461"
             column="12"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="455"
+            line="461"
             column="29"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="467"
+            line="473"
             column="35"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="           ~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="484"
+            line="490"
             column="12"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="484"
+            line="490"
             column="32"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="503"
+            line="509"
             column="38"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="           ~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="535"
+            line="541"
             column="12"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="759"
+            line="795"
             column="29"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="778"
+            line="814"
             column="32"/>
     </issue>
 
diff --git a/emoji/appcompat/lint-baseline.xml b/emoji/appcompat/lint-baseline.xml
index 5b033bb..54b755b 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/emoji/bundled/lint-baseline.xml b/emoji/bundled/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/emoji/bundled/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/emoji/core/lint-baseline.xml b/emoji/core/lint-baseline.xml
index 79d3ead..e83ff72 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="PrivateConstructorForUtilityClass"
diff --git a/enterprise/feedback/lint-baseline.xml b/enterprise/feedback/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/enterprise/feedback/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/enterprise/feedback/testing/lint-baseline.xml b/enterprise/feedback/testing/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/enterprise/feedback/testing/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/exifinterface/exifinterface/lint-baseline.xml b/exifinterface/exifinterface/lint-baseline.xml
index 3d38a45..ceebab0 100644
--- a/exifinterface/exifinterface/lint-baseline.xml
+++ b/exifinterface/exifinterface/lint-baseline.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
+            line="7852"
+            column="9"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/gridlayout/gridlayout/lint-baseline.xml b/gridlayout/gridlayout/lint-baseline.xml
index b222d69..ee30517 100644
--- a/gridlayout/gridlayout/lint-baseline.xml
+++ b/gridlayout/gridlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/heifwriter/heifwriter/lint-baseline.xml b/heifwriter/heifwriter/lint-baseline.xml
index d6bcb40..fc43d54 100644
--- a/heifwriter/heifwriter/lint-baseline.xml
+++ b/heifwriter/heifwriter/lint-baseline.xml
@@ -1,5 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized void updateInputEOSTime(long timestampNs) {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/heifwriter/HeifEncoder.java"
+            line="826"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized boolean updateLastInputAndEncoderTime(long inputTimeNs, long encoderTimeUs) {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/heifwriter/HeifEncoder.java"
+            line="841"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized void updateLastOutputTime(long outputTimeUs) {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/heifwriter/HeifEncoder.java"
+            line="854"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized void waitForResult(long timeoutMs) throws Exception {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"
+            line="663"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized void signalResult(@Nullable Exception e) {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"
+            line="693"
+            column="9"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
@@ -96,7 +151,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifEncoder.java"
-            line="444"
+            line="448"
             column="34"/>
     </issue>
 
@@ -107,7 +162,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="206"
+            line="208"
             column="16"/>
     </issue>
 
@@ -118,7 +173,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="221"
+            line="223"
             column="16"/>
     </issue>
 
@@ -129,7 +184,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="233"
+            line="235"
             column="16"/>
     </issue>
 
@@ -140,7 +195,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="252"
+            line="254"
             column="16"/>
     </issue>
 
@@ -151,7 +206,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="267"
+            line="269"
             column="16"/>
     </issue>
 
@@ -162,7 +217,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="283"
+            line="285"
             column="16"/>
     </issue>
 
@@ -173,7 +228,7 @@
         errorLine2="               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="295"
+            line="297"
             column="16"/>
     </issue>
 
diff --git a/jetifier/jetifier/core/lint-baseline.xml b/jetifier/jetifier/core/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/jetifier/jetifier/core/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/jetifier/jetifier/preprocessor/lint-baseline.xml b/jetifier/jetifier/preprocessor/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/jetifier/jetifier/preprocessor/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/jetifier/jetifier/processor/lint-baseline.xml b/jetifier/jetifier/processor/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/jetifier/jetifier/processor/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/jetifier/jetifier/standalone/lint-baseline.xml b/jetifier/jetifier/standalone/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/jetifier/jetifier/standalone/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/leanback/leanback-preference/lint-baseline.xml b/leanback/leanback-preference/lint-baseline.xml
index b8f4178..96a39fa 100644
--- a/leanback/leanback-preference/lint-baseline.xml
+++ b/leanback/leanback-preference/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/leanback/leanback/lint-baseline.xml b/leanback/leanback/lint-baseline.xml
index 66840b8..9677005 100644
--- a/leanback/leanback/lint-baseline.xml
+++ b/leanback/leanback/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="PrivateConstructorForUtilityClass"
@@ -1314,7 +1314,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="667"
+            line="663"
             column="43"/>
     </issue>
 
@@ -1325,7 +1325,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="680"
+            line="676"
             column="44"/>
     </issue>
 
@@ -1336,7 +1336,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="712"
+            line="708"
             column="54"/>
     </issue>
 
@@ -1347,7 +1347,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="724"
+            line="720"
             column="54"/>
     </issue>
 
@@ -1358,7 +1358,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="733"
+            line="729"
             column="57"/>
     </issue>
 
@@ -1369,7 +1369,7 @@
         errorLine2="                                                                    ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="798"
+            line="794"
             column="69"/>
     </issue>
 
@@ -1380,7 +1380,7 @@
         errorLine2="                                                              ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="824"
+            line="820"
             column="63"/>
     </issue>
 
@@ -1391,7 +1391,7 @@
         errorLine2="                                                              ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="903"
+            line="899"
             column="63"/>
     </issue>
 
@@ -1402,7 +1402,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="919"
+            line="915"
             column="40"/>
     </issue>
 
@@ -1413,7 +1413,7 @@
         errorLine2="                                                  ~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="919"
+            line="915"
             column="51"/>
     </issue>
 
@@ -1424,7 +1424,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="933"
+            line="929"
             column="12"/>
     </issue>
 
@@ -1435,7 +1435,7 @@
         errorLine2="                                                                    ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="947"
+            line="943"
             column="69"/>
     </issue>
 
@@ -1446,7 +1446,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1043"
+            line="1039"
             column="45"/>
     </issue>
 
@@ -1457,7 +1457,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1051"
+            line="1047"
             column="46"/>
     </issue>
 
@@ -1468,7 +1468,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1059"
+            line="1055"
             column="43"/>
     </issue>
 
@@ -1479,7 +1479,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1067"
+            line="1063"
             column="43"/>
     </issue>
 
@@ -1490,7 +1490,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1075"
+            line="1071"
             column="12"/>
     </issue>
 
@@ -1501,7 +1501,7 @@
         errorLine2="                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1080"
+            line="1076"
             column="37"/>
     </issue>
 
@@ -1512,7 +1512,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1091"
+            line="1087"
             column="39"/>
     </issue>
 
@@ -1523,29 +1523,18 @@
         errorLine2="                                                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1101"
+            line="1097"
             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 void setRecyclerListener(RecyclerView.RecyclerListener listener) {"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1162"
-            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 removeView(View view) {"
         errorLine2="                           ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/BaseGridView.java"
-            line="1356"
+            line="1347"
             column="28"/>
     </issue>
 
diff --git a/legacy/core-utils/lint-baseline.xml b/legacy/core-utils/lint-baseline.xml
index 62f3f2a..407d740 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/lifecycle/lifecycle-common/lint-baseline.xml b/lifecycle/lifecycle-common/lint-baseline.xml
index 10f000f..6917259 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 4.1.0-alpha08" client="gradle" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
diff --git a/lifecycle/lifecycle-extensions/lint-baseline.xml b/lifecycle/lifecycle-extensions/lint-baseline.xml
index 5282ec6..614e7da 100644
--- a/lifecycle/lifecycle-extensions/lint-baseline.xml
+++ b/lifecycle/lifecycle-extensions/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="PrivateConstructorForUtilityClass"
diff --git a/lifecycle/lifecycle-livedata-core/lint-baseline.xml b/lifecycle/lifecycle-livedata-core/lint-baseline.xml
index ca7613a..ed64b0a 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="RestrictedApi"
diff --git a/lifecycle/lifecycle-livedata/lint-baseline.xml b/lifecycle/lifecycle-livedata/lint-baseline.xml
index 7e0d026..7673309 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="RestrictedApi"
diff --git a/lifecycle/lifecycle-reactivestreams/lint-baseline.xml b/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
index 37375c4..63f8055 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="RestrictedApi"
diff --git a/lifecycle/lifecycle-runtime/lint-baseline.xml b/lifecycle/lifecycle-runtime/lint-baseline.xml
index 9329bc6..9cd5f9b 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="RestrictedApi"
@@ -8,7 +8,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="57"
+            line="52"
             column="13"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                         ~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="150"
+            line="153"
             column="26"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                                 ~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="153"
+            line="156"
             column="50"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                                                 ~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="154"
+            line="157"
             column="50"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                                                                            ~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="159"
+            line="162"
             column="77"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                                                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="171"
+            line="175"
             column="51"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="186"
+            line="190"
             column="33"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="223"
+            line="232"
             column="22"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="233"
+            line="243"
             column="29"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="293"
+            line="254"
             column="30"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="298"
+            line="259"
             column="37"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="308"
+            line="273"
             column="30"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="313"
+            line="278"
             column="37"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="333"
+            line="301"
             column="47"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                                                                              ~~~~~~">
         <location
             file="src/main/java/androidx/lifecycle/LifecycleRegistry.java"
-            line="336"
+            line="304"
             column="79"/>
     </issue>
 
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml b/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
index 6b3d732..0576d40 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
diff --git a/lint-checks/lint-baseline.xml b/lint-checks/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/lint-checks/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt b/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
index 89bd7ec..4ad1f69 100644
--- a/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
+++ b/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
@@ -41,6 +41,7 @@
                 SampledAnnotationEnforcer.MULTIPLE_FUNCTIONS_FOUND,
                 SampledAnnotationEnforcer.INVALID_SAMPLES_LOCATION,
                 ObsoleteBuildCompatUsageDetector.ISSUE,
+                BanSynchronizedMethods.ISSUE,
                 MetadataTagInsideApplicationTagDetector.ISSUE,
                 PrivateConstructorForUtilityClass.ISSUE
             )
diff --git a/lint-checks/src/main/java/androidx/build/lint/BanSynchronizedMethods.kt b/lint-checks/src/main/java/androidx/build/lint/BanSynchronizedMethods.kt
new file mode 100644
index 0000000..0703917
--- /dev/null
+++ b/lint-checks/src/main/java/androidx/build/lint/BanSynchronizedMethods.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.build.lint
+
+import com.android.tools.lint.client.api.UElementHandler
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.intellij.lang.jvm.JvmModifier
+import org.jetbrains.uast.UMethod
+
+class BanSynchronizedMethods : Detector(), Detector.UastScanner {
+
+    override fun getApplicableUastTypes() = listOf(UMethod::class.java)
+
+    override fun createUastHandler(context: JavaContext) = object : UElementHandler() {
+        override fun visitMethod(node: UMethod) {
+            if (node.hasModifier(JvmModifier.SYNCHRONIZED)) {
+                context.report(
+                    BanSynchronizedMethods.ISSUE, node,
+                    context.getLocation(node),
+                    "Use of synchronized methods is not recommended",
+                    null
+                )
+            }
+        }
+    }
+
+    companion object {
+        val ISSUE = Issue.create("BanSynchronizedMethods",
+            "Method is synchronized",
+            "Use of synchronized methods is not recommended," +
+                    " please refer to https://g3doc.corp.google.com/company/teams/androidx/" +
+                    "api_guidelines.md#avoid-synchronized-methods",
+            Category.CORRECTNESS, 5, Severity.ERROR,
+            Implementation(BanSynchronizedMethods::class.java, Scope.JAVA_FILE_SCOPE))
+    }
+}
diff --git a/media/media/lint-baseline.xml b/media/media/lint-baseline.xml
index f456763..8afb115 100644
--- a/media/media/lint-baseline.xml
+++ b/media/media/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
@@ -85,7 +85,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/media/AudioAttributesCompat.java"
-            line="477"
+            line="485"
             column="16"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/AudioAttributesImplApi21.java"
-            line="43"
+            line="42"
             column="12"/>
     </issue>
 
@@ -1801,7 +1801,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="616"
+            line="618"
             column="29"/>
     </issue>
 
@@ -1812,7 +1812,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="632"
+            line="634"
             column="29"/>
     </issue>
 
@@ -1823,7 +1823,7 @@
         errorLine2="                                               ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="632"
+            line="634"
             column="48"/>
     </issue>
 
@@ -1834,7 +1834,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="648"
+            line="650"
             column="36"/>
     </issue>
 
@@ -1845,7 +1845,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="665"
+            line="667"
             column="40"/>
     </issue>
 
@@ -1856,7 +1856,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="707"
+            line="709"
             column="37"/>
     </issue>
 
@@ -1867,7 +1867,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="751"
+            line="753"
             column="34"/>
     </issue>
 
@@ -1878,7 +1878,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="751"
+            line="753"
             column="48"/>
     </issue>
 
@@ -1889,7 +1889,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="781"
+            line="783"
             column="12"/>
     </issue>
 
@@ -1900,7 +1900,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="791"
+            line="793"
             column="12"/>
     </issue>
 
@@ -1911,7 +1911,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="800"
+            line="802"
             column="34"/>
     </issue>
 
@@ -1922,7 +1922,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="812"
+            line="814"
             column="29"/>
     </issue>
 
@@ -1933,7 +1933,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="827"
+            line="830"
             column="26"/>
     </issue>
 
@@ -1944,7 +1944,7 @@
         errorLine2="                              ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="838"
+            line="854"
             column="31"/>
     </issue>
 
@@ -1955,7 +1955,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="907"
+            line="923"
             column="27"/>
     </issue>
 
@@ -1966,7 +1966,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="921"
+            line="937"
             column="12"/>
     </issue>
 
@@ -1977,7 +1977,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="935"
+            line="951"
             column="12"/>
     </issue>
 
@@ -1988,7 +1988,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="971"
+            line="987"
             column="12"/>
     </issue>
 
@@ -1999,7 +1999,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="982"
+            line="998"
             column="43"/>
     </issue>
 
@@ -2010,7 +2010,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="995"
+            line="1011"
             column="46"/>
     </issue>
 
@@ -2021,7 +2021,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1018"
+            line="1034"
             column="19"/>
     </issue>
 
@@ -2032,7 +2032,7 @@
         errorLine2="                                                      ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1018"
+            line="1034"
             column="55"/>
     </issue>
 
@@ -2043,7 +2043,7 @@
         errorLine2="                                                                       ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1018"
+            line="1034"
             column="72"/>
     </issue>
 
@@ -2054,7 +2054,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1151"
+            line="1167"
             column="31"/>
     </issue>
 
@@ -2065,7 +2065,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1151"
+            line="1167"
             column="47"/>
     </issue>
 
@@ -2076,7 +2076,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1151"
+            line="1167"
             column="62"/>
     </issue>
 
@@ -2087,7 +2087,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1165"
+            line="1181"
             column="43"/>
     </issue>
 
@@ -2098,7 +2098,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1258"
+            line="1274"
             column="42"/>
     </issue>
 
@@ -2109,7 +2109,7 @@
         errorLine2="                                                         ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1258"
+            line="1274"
             column="58"/>
     </issue>
 
@@ -2120,7 +2120,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1268"
+            line="1284"
             column="41"/>
     </issue>
 
@@ -2131,7 +2131,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1268"
+            line="1284"
             column="55"/>
     </issue>
 
@@ -2142,7 +2142,7 @@
         errorLine2="                                     ~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1276"
+            line="1292"
             column="38"/>
     </issue>
 
@@ -2153,7 +2153,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1276"
+            line="1292"
             column="47"/>
     </issue>
 
@@ -2164,7 +2164,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1289"
+            line="1305"
             column="39"/>
     </issue>
 
@@ -2175,7 +2175,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1289"
+            line="1305"
             column="55"/>
     </issue>
 
@@ -2186,7 +2186,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1298"
+            line="1314"
             column="38"/>
     </issue>
 
@@ -2197,7 +2197,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1298"
+            line="1314"
             column="52"/>
     </issue>
 
@@ -2208,7 +2208,7 @@
         errorLine2="                                  ~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1304"
+            line="1320"
             column="35"/>
     </issue>
 
@@ -2219,7 +2219,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1304"
+            line="1320"
             column="44"/>
     </issue>
 
@@ -2230,7 +2230,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1363"
+            line="1379"
             column="33"/>
     </issue>
 
@@ -2241,7 +2241,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1372"
+            line="1388"
             column="33"/>
     </issue>
 
@@ -2252,7 +2252,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1372"
+            line="1388"
             column="54"/>
     </issue>
 
@@ -2263,7 +2263,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1443"
+            line="1459"
             column="36"/>
     </issue>
 
@@ -2274,7 +2274,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1443"
+            line="1459"
             column="51"/>
     </issue>
 
@@ -2285,7 +2285,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1453"
+            line="1469"
             column="36"/>
     </issue>
 
@@ -2296,7 +2296,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1465"
+            line="1481"
             column="36"/>
     </issue>
 
@@ -2307,7 +2307,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1476"
+            line="1492"
             column="39"/>
     </issue>
 
@@ -2318,7 +2318,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1936"
+            line="1952"
             column="23"/>
     </issue>
 
@@ -2329,7 +2329,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1936"
+            line="1952"
             column="39"/>
     </issue>
 
@@ -2340,7 +2340,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1954"
+            line="1970"
             column="23"/>
     </issue>
 
@@ -2351,7 +2351,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1954"
+            line="1970"
             column="39"/>
     </issue>
 
@@ -2362,7 +2362,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1954"
+            line="1970"
             column="53"/>
     </issue>
 
@@ -2373,7 +2373,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1971"
+            line="1987"
             column="35"/>
     </issue>
 
@@ -2384,7 +2384,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2015"
+            line="2031"
             column="16"/>
     </issue>
 
@@ -2395,7 +2395,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2023"
+            line="2039"
             column="16"/>
     </issue>
 
@@ -2406,7 +2406,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2033"
+            line="2049"
             column="36"/>
     </issue>
 
@@ -2417,7 +2417,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2043"
+            line="2059"
             column="16"/>
     </issue>
 
@@ -2428,7 +2428,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2053"
+            line="2069"
             column="38"/>
     </issue>
 
@@ -2439,7 +2439,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2063"
+            line="2079"
             column="16"/>
     </issue>
 
@@ -2450,7 +2450,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2085"
+            line="2101"
             column="23"/>
     </issue>
 
@@ -2461,7 +2461,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2085"
+            line="2101"
             column="40"/>
     </issue>
 
@@ -2472,7 +2472,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2140"
+            line="2156"
             column="26"/>
     </issue>
 
@@ -2483,7 +2483,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2167"
+            line="2183"
             column="16"/>
     </issue>
 
@@ -2494,7 +2494,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2179"
+            line="2195"
             column="35"/>
     </issue>
 
@@ -2505,7 +2505,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2199"
+            line="2215"
             column="16"/>
     </issue>
 
@@ -2516,7 +2516,7 @@
         errorLine2="                      ~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2219"
+            line="2235"
             column="23"/>
     </issue>
 
@@ -2527,7 +2527,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2219"
+            line="2235"
             column="47"/>
     </issue>
 
@@ -2538,7 +2538,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2241"
+            line="2257"
             column="23"/>
     </issue>
 
@@ -2549,7 +2549,7 @@
         errorLine2="                                                        ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2241"
+            line="2257"
             column="57"/>
     </issue>
 
@@ -3341,7 +3341,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/media/VolumeProviderCompat.java"
-            line="156"
+            line="188"
             column="29"/>
     </issue>
 
@@ -3352,7 +3352,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/media/VolumeProviderCompat.java"
-            line="168"
+            line="200"
             column="12"/>
     </issue>
 
@@ -3363,7 +3363,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/VolumeProviderCompat.java"
-            line="189"
+            line="236"
             column="46"/>
     </issue>
 
diff --git a/media/version-compat-tests/lib/lint-baseline.xml b/media/version-compat-tests/lib/lint-baseline.xml
index 2219ca8..0fc4935 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/media2/common/lint-baseline.xml b/media2/common/lint-baseline.xml
index effea2e..c817f51 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="KotlinPropertyAccess"
diff --git a/media2/player/lint-baseline.xml b/media2/player/lint-baseline.xml
index fe836db..b942e75 100644
--- a/media2/player/lint-baseline.xml
+++ b/media2/player/lint-baseline.xml
@@ -1,5 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/player/TextRenderer.java"
+            line="132"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/player/TextRenderer.java"
+            line="137"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /** Clears any previous selection. */"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/player/TextRenderer.java"
+            line="224"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /** Selects the specified track type/channel for extraction and rendering. */"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/player/TextRenderer.java"
+            line="229"
+            column="5"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/media2/session/lint-baseline.xml b/media2/session/lint-baseline.xml
index ae69ddf..fcf8d68 100644
--- a/media2/session/lint-baseline.xml
+++ b/media2/session/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -52,7 +52,7 @@
         errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="285"
+            line="284"
             column="19"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="285"
+            line="284"
             column="48"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="299"
+            line="298"
             column="19"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="299"
+            line="298"
             column="48"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="315"
+            line="314"
             column="19"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="315"
+            line="314"
             column="48"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                  ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="350"
+            line="349"
             column="19"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="350"
+            line="349"
             column="48"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="361"
+            line="360"
             column="19"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="362"
+            line="361"
             column="13"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="376"
+            line="375"
             column="19"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                                                                      ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="376"
+            line="375"
             column="71"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="393"
+            line="392"
             column="19"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="                                                                      ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="393"
+            line="392"
             column="71"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="404"
+            line="403"
             column="19"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="                                                         ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="404"
+            line="403"
             column="58"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="422"
+            line="421"
             column="19"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="423"
+            line="422"
             column="13"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="                                         ~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="443"
+            line="442"
             column="42"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="                                                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="443"
+            line="442"
             column="75"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="538"
+            line="537"
             column="19"/>
     </issue>
 
@@ -283,7 +283,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="538"
+            line="537"
             column="56"/>
     </issue>
 
@@ -294,7 +294,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="555"
+            line="554"
             column="19"/>
     </issue>
 
@@ -305,7 +305,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="555"
+            line="554"
             column="68"/>
     </issue>
 
@@ -316,7 +316,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="590"
+            line="589"
             column="19"/>
     </issue>
 
@@ -327,7 +327,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="590"
+            line="589"
             column="42"/>
     </issue>
 
@@ -338,7 +338,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="626"
+            line="625"
             column="19"/>
     </issue>
 
@@ -349,7 +349,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="626"
+            line="625"
             column="54"/>
     </issue>
 
@@ -360,7 +360,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="656"
+            line="655"
             column="19"/>
     </issue>
 
@@ -371,7 +371,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="657"
+            line="656"
             column="13"/>
     </issue>
 
@@ -382,7 +382,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="672"
+            line="671"
             column="19"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="673"
+            line="672"
             column="13"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="714"
+            line="713"
             column="44"/>
     </issue>
 
@@ -415,7 +415,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="758"
+            line="757"
             column="19"/>
     </issue>
 
@@ -426,7 +426,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="759"
+            line="758"
             column="13"/>
     </issue>
 
@@ -437,7 +437,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="769"
+            line="768"
             column="48"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="                                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="785"
+            line="784"
             column="58"/>
     </issue>
 
diff --git a/media2/session/version-compat-tests/common/lint-baseline.xml b/media2/session/version-compat-tests/common/lint-baseline.xml
index 67b4748..11f0665 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/media2/widget/lint-baseline.xml b/media2/widget/lint-baseline.xml
index 6345eb1..dcbb31d 100644
--- a/media2/widget/lint-baseline.xml
+++ b/media2/widget/lint-baseline.xml
@@ -1,5 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    protected synchronized void updateActiveCues(boolean rebuild, long timeMs) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
+            line="127"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    private synchronized void takeTime(long timeMs) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
+            line="197"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    protected synchronized void clearActiveCues() {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
+            line="201"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    protected synchronized boolean addCue(Cue cue) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
+            line="291"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
+            line="364"
+            column="5"/>
+    </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
diff --git a/mediarouter/mediarouter/lint-baseline.xml b/mediarouter/mediarouter/lint-baseline.xml
index 4796cbd..e4e498d 100644
--- a/mediarouter/mediarouter/lint-baseline.xml
+++ b/mediarouter/mediarouter/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -140,7 +140,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java"
-            line="149"
+            line="157"
             column="37"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java"
-            line="282"
+            line="296"
             column="12"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java"
-            line="288"
+            line="302"
             column="12"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="142"
+            line="146"
             column="29"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="146"
+            line="150"
             column="29"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="146"
+            line="150"
             column="46"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="150"
+            line="154"
             column="29"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="150"
+            line="154"
             column="46"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="228"
+            line="232"
             column="34"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="              ~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="387"
+            line="460"
             column="15"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="                                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="419"
+            line="492"
             column="44"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="444"
+            line="517"
             column="38"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/app/MediaRouteButton.java"
-            line="539"
+            line="612"
             column="27"/>
     </issue>
 
@@ -1438,7 +1438,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="346"
+            line="350"
             column="16"/>
     </issue>
 
@@ -1449,7 +1449,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="353"
+            line="357"
             column="16"/>
     </issue>
 
@@ -1460,7 +1460,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="454"
+            line="458"
             column="41"/>
     </issue>
 
@@ -1471,7 +1471,7 @@
         errorLine2="                                                 ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="508"
+            line="516"
             column="50"/>
     </issue>
 
@@ -1482,7 +1482,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="549"
+            line="564"
             column="23"/>
     </issue>
 
@@ -1493,7 +1493,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="760"
+            line="836"
             column="32"/>
     </issue>
 
@@ -1504,7 +1504,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="767"
+            line="843"
             column="32"/>
     </issue>
 
@@ -1515,7 +1515,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="778"
+            line="854"
             column="24"/>
     </issue>
 
@@ -1526,7 +1526,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="786"
+            line="862"
             column="24"/>
     </issue>
 
@@ -1537,7 +1537,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="795"
+            line="871"
             column="24"/>
     </issue>
 
@@ -1548,7 +1548,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="803"
+            line="879"
             column="24"/>
     </issue>
 
@@ -1559,7 +1559,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProvider.java"
-            line="811"
+            line="887"
             column="24"/>
     </issue>
 
@@ -1680,7 +1680,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="197"
+            line="199"
             column="21"/>
     </issue>
 
@@ -1691,7 +1691,7 @@
         errorLine2="           ~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="200"
+            line="202"
             column="12"/>
     </issue>
 
@@ -1702,7 +1702,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="200"
+            line="202"
             column="27"/>
     </issue>
 
@@ -1713,7 +1713,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java"
-            line="218"
+            line="220"
             column="12"/>
     </issue>
 
@@ -1790,7 +1790,7 @@
         errorLine2="                  ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="312"
+            line="280"
             column="19"/>
     </issue>
 
@@ -1801,7 +1801,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="329"
+            line="297"
             column="12"/>
     </issue>
 
@@ -1812,7 +1812,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="343"
+            line="311"
             column="12"/>
     </issue>
 
@@ -1823,7 +1823,7 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="367"
+            line="335"
             column="12"/>
     </issue>
 
@@ -1834,7 +1834,7 @@
         errorLine2="                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="505"
+            line="473"
             column="41"/>
     </issue>
 
@@ -1845,7 +1845,7 @@
         errorLine2="                                             ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="515"
+            line="483"
             column="46"/>
     </issue>
 
@@ -1856,7 +1856,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="574"
+            line="542"
             column="29"/>
     </issue>
 
@@ -1867,7 +1867,7 @@
         errorLine2="                                                         ~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="574"
+            line="542"
             column="58"/>
     </issue>
 
@@ -1878,7 +1878,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="847"
+            line="831"
             column="33"/>
     </issue>
 
@@ -1889,7 +1889,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="862"
+            line="846"
             column="39"/>
     </issue>
 
@@ -1900,7 +1900,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="869"
+            line="853"
             column="12"/>
     </issue>
 
@@ -1911,7 +1911,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1075"
+            line="1090"
             column="16"/>
     </issue>
 
@@ -1922,7 +1922,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1104"
+            line="1119"
             column="16"/>
     </issue>
 
@@ -1933,7 +1933,7 @@
         errorLine2="               ~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1130"
+            line="1145"
             column="16"/>
     </issue>
 
@@ -1944,7 +1944,29 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1231"
+            line="1246"
+            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 DynamicGroupState getDynamicGroupState(RouteInfo route) {"
+        errorLine2="                                                      ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
+            line="1614"
+            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 MediaRouteProvider getProviderInstance() {"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
+            line="1845"
             column="16"/>
     </issue>
 
@@ -1955,18 +1977,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1829"
-            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 MediaRouteProvider getProviderInstance() {"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1929"
+            line="1954"
             column="16"/>
     </issue>
 
@@ -1977,7 +1988,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1937"
+            line="1962"
             column="16"/>
     </issue>
 
@@ -1988,7 +1999,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1944"
+            line="1969"
             column="16"/>
     </issue>
 
@@ -1999,7 +2010,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="1951"
+            line="1976"
             column="16"/>
     </issue>
 
@@ -2010,7 +2021,7 @@
         errorLine2="                                    ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2031"
+            line="2056"
             column="37"/>
     </issue>
 
@@ -2021,7 +2032,7 @@
         errorLine2="                                                        ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2031"
+            line="2056"
             column="57"/>
     </issue>
 
@@ -2032,7 +2043,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2064"
+            line="2109"
             column="39"/>
     </issue>
 
@@ -2043,7 +2054,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2064"
+            line="2109"
             column="59"/>
     </issue>
 
@@ -2054,7 +2065,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2083"
+            line="2128"
             column="39"/>
     </issue>
 
@@ -2065,7 +2076,7 @@
         errorLine2="                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2083"
+            line="2128"
             column="59"/>
     </issue>
 
@@ -2076,7 +2087,7 @@
         errorLine2="                                 ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2094"
+            line="2139"
             column="34"/>
     </issue>
 
@@ -2087,7 +2098,7 @@
         errorLine2="                                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2094"
+            line="2139"
             column="54"/>
     </issue>
 
@@ -2098,7 +2109,7 @@
         errorLine2="                                   ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2103"
+            line="2148"
             column="36"/>
     </issue>
 
@@ -2109,7 +2120,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2103"
+            line="2148"
             column="56"/>
     </issue>
 
@@ -2120,7 +2131,7 @@
         errorLine2="                                   ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2112"
+            line="2157"
             column="36"/>
     </issue>
 
@@ -2131,7 +2142,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2112"
+            line="2157"
             column="56"/>
     </issue>
 
@@ -2142,7 +2153,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2121"
+            line="2166"
             column="42"/>
     </issue>
 
@@ -2153,7 +2164,7 @@
         errorLine2="                                                             ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2121"
+            line="2166"
             column="62"/>
     </issue>
 
@@ -2164,7 +2175,7 @@
         errorLine2="                                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2136"
+            line="2181"
             column="55"/>
     </issue>
 
@@ -2175,7 +2186,7 @@
         errorLine2="                                                                          ~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2136"
+            line="2181"
             column="75"/>
     </issue>
 
@@ -2186,7 +2197,7 @@
         errorLine2="                                    ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2145"
+            line="2190"
             column="37"/>
     </issue>
 
@@ -2197,7 +2208,7 @@
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2145"
+            line="2190"
             column="57"/>
     </issue>
 
@@ -2208,7 +2219,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2154"
+            line="2199"
             column="39"/>
     </issue>
 
@@ -2219,7 +2230,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2154"
+            line="2199"
             column="59"/>
     </issue>
 
@@ -2230,7 +2241,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2163"
+            line="2208"
             column="39"/>
     </issue>
 
@@ -2241,7 +2252,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2163"
+            line="2208"
             column="59"/>
     </issue>
 
@@ -2252,35 +2263,13 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2179"
+            line="2258"
             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 onError(String error, Bundle data) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2190"
-            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 void onError(String error, Bundle data) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/mediarouter/media/MediaRouter.java"
-            line="2190"
-            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 int getDeviceType(Object routeObj) {"
         errorLine2="                                        ~~~~~~">
         <location
diff --git a/paging/runtime/lint-baseline.xml b/paging/runtime/lint-baseline.xml
index b1ecd02..7e00be8 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="RestrictedApi"
diff --git a/percentlayout/percentlayout/lint-baseline.xml b/percentlayout/percentlayout/lint-baseline.xml
index ebdc40c..33175ac 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/placeholder-tests/lint-baseline.xml b/placeholder-tests/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/placeholder-tests/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/preference/preference/lint-baseline.xml b/preference/preference/lint-baseline.xml
index e4bd779..0f5739b 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="KotlinPropertyAccess"
@@ -2263,7 +2263,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="88"
+            line="90"
             column="26"/>
     </issue>
 
@@ -2274,7 +2274,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="149"
+            line="151"
             column="34"/>
     </issue>
 
@@ -2285,7 +2285,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="187"
+            line="189"
             column="12"/>
     </issue>
 
@@ -2296,7 +2296,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="206"
+            line="208"
             column="43"/>
     </issue>
 
@@ -2307,7 +2307,7 @@
         errorLine2="              ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="242"
+            line="255"
             column="15"/>
     </issue>
 
@@ -2318,7 +2318,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="242"
+            line="255"
             column="39"/>
     </issue>
 
@@ -2329,7 +2329,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="262"
+            line="275"
             column="37"/>
     </issue>
 
@@ -2340,7 +2340,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="288"
+            line="301"
             column="25"/>
     </issue>
 
@@ -2351,7 +2351,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragment.java"
-            line="293"
+            line="306"
             column="27"/>
     </issue>
 
@@ -2362,7 +2362,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="75"
+            line="77"
             column="26"/>
     </issue>
 
@@ -2373,7 +2373,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="136"
+            line="138"
             column="27"/>
     </issue>
 
@@ -2384,7 +2384,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="170"
+            line="172"
             column="12"/>
     </issue>
 
@@ -2395,7 +2395,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="186"
+            line="188"
             column="43"/>
     </issue>
 
@@ -2406,7 +2406,7 @@
         errorLine2="              ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="219"
+            line="232"
             column="15"/>
     </issue>
 
@@ -2417,7 +2417,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="219"
+            line="232"
             column="39"/>
     </issue>
 
@@ -2428,7 +2428,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="235"
+            line="248"
             column="37"/>
     </issue>
 
@@ -2439,7 +2439,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java"
-            line="257"
+            line="270"
             column="25"/>
     </issue>
 
@@ -2923,7 +2923,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="447"
+            line="453"
             column="36"/>
     </issue>
 
@@ -2934,7 +2934,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="513"
+            line="525"
             column="18"/>
     </issue>
 
@@ -2945,7 +2945,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="531"
+            line="543"
             column="12"/>
     </issue>
 
@@ -2956,7 +2956,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="531"
+            line="543"
             column="46"/>
     </issue>
 
@@ -2967,7 +2967,7 @@
         errorLine2="                                                                      ~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="531"
+            line="543"
             column="71"/>
     </issue>
 
@@ -2978,7 +2978,7 @@
         errorLine2="            ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="532"
+            line="544"
             column="13"/>
     </issue>
 
@@ -2989,7 +2989,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="558"
+            line="570"
             column="12"/>
     </issue>
 
@@ -3000,7 +3000,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="568"
+            line="580"
             column="15"/>
     </issue>
 
@@ -3011,7 +3011,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="568"
+            line="580"
             column="52"/>
     </issue>
 
@@ -3022,7 +3022,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="580"
+            line="592"
             column="43"/>
     </issue>
 
@@ -3033,7 +3033,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="626"
+            line="644"
             column="12"/>
     </issue>
 
@@ -3044,7 +3044,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="630"
+            line="648"
             column="42"/>
     </issue>
 
@@ -3055,7 +3055,7 @@
         errorLine2="                                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="634"
+            line="652"
             column="42"/>
     </issue>
 
@@ -3066,7 +3066,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="691"
+            line="709"
             column="43"/>
     </issue>
 
@@ -3077,7 +3077,7 @@
         errorLine2="                                                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="691"
+            line="709"
             column="76"/>
     </issue>
 
@@ -3088,7 +3088,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="707"
+            line="725"
             column="41"/>
     </issue>
 
@@ -3099,7 +3099,7 @@
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="707"
+            line="725"
             column="74"/>
     </issue>
 
@@ -3110,7 +3110,7 @@
         errorLine2="                ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/PreferenceFragmentCompat.java"
-            line="721"
+            line="739"
             column="17"/>
     </issue>
 
diff --git a/recommendation/recommendation/lint-baseline.xml b/recommendation/recommendation/lint-baseline.xml
index 3aac549..dfffa6a 100644
--- a/recommendation/recommendation/lint-baseline.xml
+++ b/recommendation/recommendation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/recyclerview/recyclerview-selection/lint-baseline.xml b/recyclerview/recyclerview-selection/lint-baseline.xml
index 178e1b5..3a57b65 100644
--- a/recyclerview/recyclerview-selection/lint-baseline.xml
+++ b/recyclerview/recyclerview-selection/lint-baseline.xml
@@ -1,5 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @MainThread"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
+            line="71"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @MainThread"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
+            line="82"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /** @hide */"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
+            line="97"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /** @hide */"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
+            line="109"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
+            line="115"
+            column="5"/>
+    </issue>
 
     <issue
         id="LambdaLast"
diff --git a/recyclerview/recyclerview/lint-baseline.xml b/recyclerview/recyclerview/lint-baseline.xml
index 584fce4..f431762 100644
--- a/recyclerview/recyclerview/lint-baseline.xml
+++ b/recyclerview/recyclerview/lint-baseline.xml
@@ -1,5 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized SyncQueueItem next() {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"
+            line="237"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized void sendMessageAtFrontOfQueue(SyncQueueItem item) {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"
+            line="246"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized void sendMessage(SyncQueueItem item) {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"
+            line="251"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized void removeMessages(int what) {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"
+            line="263"
+            column="9"/>
+    </issue>
 
     <issue
         id="KotlinPropertyAccess"
@@ -8,7 +52,7 @@
         errorLine2="                   ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1076"
+            line="1102"
             column="20"/>
     </issue>
 
@@ -19,7 +63,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7327"
+            line="7412"
             column="30"/>
     </issue>
 
@@ -30,7 +74,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11694"
+            line="11779"
             column="27"/>
     </issue>
 
@@ -1757,7 +1801,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="780"
+            line="806"
             column="12"/>
     </issue>
 
@@ -1768,7 +1812,7 @@
         errorLine2="              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1387"
+            line="1441"
             column="15"/>
     </issue>
 
@@ -1779,7 +1823,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1401"
+            line="1455"
             column="43"/>
     </issue>
 
@@ -1790,7 +1834,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1423"
+            line="1477"
             column="46"/>
     </issue>
 
@@ -1801,7 +1845,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1431"
+            line="1485"
             column="49"/>
     </issue>
 
@@ -1812,7 +1856,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2364"
+            line="2418"
             column="37"/>
     </issue>
 
@@ -1823,7 +1867,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2826"
+            line="2880"
             column="12"/>
     </issue>
 
@@ -1834,7 +1878,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2826"
+            line="2880"
             column="29"/>
     </issue>
 
@@ -1845,7 +1889,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2971"
+            line="3025"
             column="35"/>
     </issue>
 
@@ -1856,7 +1900,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2971"
+            line="3025"
             column="47"/>
     </issue>
 
@@ -1867,7 +1911,7 @@
         errorLine2="                                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3017"
+            line="3071"
             column="50"/>
     </issue>
 
@@ -1878,7 +1922,7 @@
         errorLine2="                                                             ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3017"
+            line="3071"
             column="62"/>
     </issue>
 
@@ -1889,7 +1933,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3022"
+            line="3076"
             column="31"/>
     </issue>
 
@@ -1900,7 +1944,7 @@
         errorLine2="                                                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3029"
+            line="3083"
             column="66"/>
     </issue>
 
@@ -1911,7 +1955,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3241"
+            line="3295"
             column="42"/>
     </issue>
 
@@ -1922,7 +1966,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3363"
+            line="3417"
             column="33"/>
     </issue>
 
@@ -1933,7 +1977,7 @@
         errorLine2="                                        ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3549"
+            line="3603"
             column="41"/>
     </issue>
 
@@ -1944,7 +1988,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3822"
+            line="3881"
             column="49"/>
     </issue>
 
@@ -1955,7 +1999,7 @@
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3830"
+            line="3889"
             column="55"/>
     </issue>
 
@@ -1966,7 +2010,7 @@
         errorLine2="                                      ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4428"
+            line="4507"
             column="39"/>
     </issue>
 
@@ -1977,7 +2021,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4523"
+            line="4602"
             column="22"/>
     </issue>
 
@@ -1988,7 +2032,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4584"
+            line="4663"
             column="24"/>
     </issue>
 
@@ -1999,7 +2043,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4594"
+            line="4673"
             column="41"/>
     </issue>
 
@@ -2010,7 +2054,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4599"
+            line="4678"
             column="15"/>
     </issue>
 
@@ -2021,7 +2065,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4607"
+            line="4686"
             column="12"/>
     </issue>
 
@@ -2032,7 +2076,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4607"
+            line="4686"
             column="56"/>
     </issue>
 
@@ -2043,7 +2087,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4615"
+            line="4694"
             column="15"/>
     </issue>
 
@@ -2054,7 +2098,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4615"
+            line="4694"
             column="59"/>
     </issue>
 
@@ -2065,7 +2109,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4862"
+            line="4941"
             column="12"/>
     </issue>
 
@@ -2076,7 +2120,7 @@
         errorLine2="           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5080"
+            line="5159"
             column="12"/>
     </issue>
 
@@ -2087,7 +2131,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5124"
+            line="5203"
             column="30"/>
     </issue>
 
@@ -2098,7 +2142,7 @@
         errorLine2="                                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5124"
+            line="5203"
             column="45"/>
     </issue>
 
@@ -2109,7 +2153,7 @@
         errorLine2="                                    ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5852"
+            line="5931"
             column="37"/>
     </issue>
 
@@ -2120,7 +2164,7 @@
         errorLine2="                                         ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8066"
+            line="8151"
             column="42"/>
     </issue>
 
@@ -2131,7 +2175,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8090"
+            line="8175"
             column="44"/>
     </issue>
 
@@ -2142,7 +2186,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8126"
+            line="8211"
             column="47"/>
     </issue>
 
@@ -2153,7 +2197,7 @@
         errorLine2="                                                                     ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8305"
+            line="8390"
             column="70"/>
     </issue>
 
@@ -2164,7 +2208,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8306"
+            line="8391"
             column="17"/>
     </issue>
 
@@ -2175,7 +2219,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8334"
+            line="8419"
             column="17"/>
     </issue>
 
@@ -2186,7 +2230,7 @@
         errorLine2="                                    ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8367"
+            line="8452"
             column="37"/>
     </issue>
 
@@ -2197,7 +2241,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8385"
+            line="8470"
             column="40"/>
     </issue>
 
@@ -2208,7 +2252,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8406"
+            line="8491"
             column="40"/>
     </issue>
 
@@ -2219,7 +2263,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8413"
+            line="8498"
             column="42"/>
     </issue>
 
@@ -2230,7 +2274,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8440"
+            line="8525"
             column="42"/>
     </issue>
 
@@ -2241,7 +2285,7 @@
         errorLine2="                                                            ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8440"
+            line="8525"
             column="61"/>
     </issue>
 
@@ -2252,7 +2296,7 @@
         errorLine2="                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8504"
+            line="8589"
             column="38"/>
     </issue>
 
@@ -2263,7 +2307,7 @@
         errorLine2="                                                        ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8504"
+            line="8589"
             column="57"/>
     </issue>
 
@@ -2274,7 +2318,7 @@
         errorLine2="                                      ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8519"
+            line="8604"
             column="39"/>
     </issue>
 
@@ -2285,7 +2329,7 @@
         errorLine2="                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8537"
+            line="8622"
             column="25"/>
     </issue>
 
@@ -2296,7 +2340,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8549"
+            line="8634"
             column="42"/>
     </issue>
 
@@ -2307,7 +2351,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8566"
+            line="8651"
             column="16"/>
     </issue>
 
@@ -2318,7 +2362,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8566"
+            line="8651"
             column="50"/>
     </issue>
 
@@ -2329,7 +2373,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8590"
+            line="8675"
             column="16"/>
     </issue>
 
@@ -2340,7 +2384,7 @@
         errorLine2="                                                 ~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8590"
+            line="8675"
             column="50"/>
     </issue>
 
@@ -2351,7 +2395,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8590"
+            line="8675"
             column="61"/>
     </issue>
 
@@ -2362,7 +2406,7 @@
         errorLine2="                                                ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8607"
+            line="8692"
             column="49"/>
     </issue>
 
@@ -2373,7 +2417,7 @@
         errorLine2="                                                                   ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8607"
+            line="8692"
             column="68"/>
     </issue>
 
@@ -2384,7 +2428,7 @@
         errorLine2="                                              ~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8624"
+            line="8709"
             column="47"/>
     </issue>
 
@@ -2395,7 +2439,7 @@
         errorLine2="                                                                 ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8624"
+            line="8709"
             column="66"/>
     </issue>
 
@@ -2406,7 +2450,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8671"
+            line="8756"
             column="44"/>
     </issue>
 
@@ -2417,7 +2461,7 @@
         errorLine2="                                                                      ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8671"
+            line="8756"
             column="71"/>
     </issue>
 
@@ -2428,7 +2472,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8686"
+            line="8771"
             column="39"/>
     </issue>
 
@@ -2439,7 +2483,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8720"
+            line="8805"
             column="34"/>
     </issue>
 
@@ -2450,7 +2494,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8739"
+            line="8824"
             column="41"/>
     </issue>
 
@@ -2461,7 +2505,7 @@
         errorLine2="                                        ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8757"
+            line="8842"
             column="41"/>
     </issue>
 
@@ -2472,7 +2516,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8768"
+            line="8853"
             column="29"/>
     </issue>
 
@@ -2483,7 +2527,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8780"
+            line="8865"
             column="29"/>
     </issue>
 
@@ -2494,7 +2538,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8846"
+            line="8931"
             column="32"/>
     </issue>
 
@@ -2505,7 +2549,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="9023"
+            line="9108"
             column="64"/>
     </issue>
 
@@ -2516,7 +2560,7 @@
         errorLine2="                                           ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="10505"
+            line="10590"
             column="44"/>
     </issue>
 
@@ -2527,7 +2571,7 @@
         errorLine2="                      ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="10823"
+            line="10908"
             column="23"/>
     </issue>
 
@@ -2538,7 +2582,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11848"
+            line="11933"
             column="31"/>
     </issue>
 
@@ -2549,7 +2593,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11855"
+            line="11940"
             column="31"/>
     </issue>
 
@@ -2560,7 +2604,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11862"
+            line="11947"
             column="31"/>
     </issue>
 
@@ -2571,7 +2615,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11868"
+            line="11953"
             column="60"/>
     </issue>
 
@@ -2582,7 +2626,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11868"
+            line="11953"
             column="76"/>
     </issue>
 
@@ -2593,7 +2637,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11873"
+            line="11958"
             column="60"/>
     </issue>
 
@@ -2604,7 +2648,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11873"
+            line="11958"
             column="76"/>
     </issue>
 
@@ -2615,7 +2659,7 @@
         errorLine2="                            ~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11904"
+            line="11989"
             column="29"/>
     </issue>
 
@@ -2626,7 +2670,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11904"
+            line="11989"
             column="40"/>
     </issue>
 
@@ -2637,7 +2681,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11912"
+            line="11997"
             column="29"/>
     </issue>
 
@@ -2648,7 +2692,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11916"
+            line="12001"
             column="29"/>
     </issue>
 
@@ -2659,7 +2703,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11920"
+            line="12005"
             column="29"/>
     </issue>
 
@@ -2670,7 +2714,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12274"
+            line="12359"
             column="37"/>
     </issue>
 
@@ -2681,7 +2725,7 @@
         errorLine2="               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12288"
+            line="12373"
             column="16"/>
     </issue>
 
@@ -2692,7 +2736,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12301"
+            line="12386"
             column="48"/>
     </issue>
 
@@ -2703,7 +2747,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12653"
+            line="12738"
             column="35"/>
     </issue>
 
@@ -2714,7 +2758,7 @@
         errorLine2="                   ~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12866"
+            line="12951"
             column="20"/>
     </issue>
 
@@ -2725,7 +2769,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12881"
+            line="12966"
             column="41"/>
     </issue>
 
@@ -4023,7 +4067,7 @@
         errorLine2="                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="3162"
+            line="3164"
             column="27"/>
     </issue>
 
@@ -4034,7 +4078,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="3196"
+            line="3198"
             column="35"/>
     </issue>
 
diff --git a/remotecallback/processor/lint-baseline.xml b/remotecallback/processor/lint-baseline.xml
new file mode 100644
index 0000000..bf058d53
--- /dev/null
+++ b/remotecallback/processor/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/remotecallback/compiler/RemoteCallbackProcessor.java"
+            line="54"
+            column="5"/>
+    </issue>
+
+</issues>
diff --git a/remotecallback/remotecallback/lint-baseline.xml b/remotecallback/remotecallback/lint-baseline.xml
index 90b54f6..a35d2d2 100644
--- a/remotecallback/remotecallback/lint-baseline.xml
+++ b/remotecallback/remotecallback/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
diff --git a/room/common/lint-baseline.xml b/room/common/lint-baseline.xml
index 922c0e4..eabb608 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 4.1.0-alpha08" client="gradle" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/room/guava/lint-baseline.xml b/room/guava/lint-baseline.xml
index a67825d..4572c21 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
diff --git a/room/migration/lint-baseline.xml b/room/migration/lint-baseline.xml
index c8f71b3..8c61639 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 4.1.0-alpha08" client="gradle" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/room/runtime/lint-baseline.xml b/room/runtime/lint-baseline.xml
index ace45d8..aad1489 100644
--- a/room/runtime/lint-baseline.xml
+++ b/room/runtime/lint-baseline.xml
@@ -1,5 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"
+            line="91"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"
+            line="100"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"
+            line="109"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/room/TransactionExecutor.java"
+            line="41"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @SuppressWarnings(&quot;WeakerAccess&quot;)"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/room/TransactionExecutor.java"
+            line="58"
+            column="5"/>
+    </issue>
 
     <issue
         id="PrivateConstructorForUtilityClass"
@@ -19,7 +74,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="152"
+            line="166"
             column="13"/>
     </issue>
 
@@ -30,7 +85,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="196"
+            line="211"
             column="13"/>
     </issue>
 
@@ -41,7 +96,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="240"
+            line="261"
             column="13"/>
     </issue>
 
@@ -85,7 +140,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="149"
+            line="163"
             column="13"/>
     </issue>
 
@@ -96,7 +151,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="190"
+            line="205"
             column="13"/>
     </issue>
 
@@ -107,7 +162,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="232"
+            line="253"
             column="13"/>
     </issue>
 
@@ -778,7 +833,7 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="201"
+            line="203"
             column="65"/>
     </issue>
 
@@ -789,7 +844,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="338"
+            line="340"
             column="12"/>
     </issue>
 
@@ -800,7 +855,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="428"
+            line="430"
             column="16"/>
     </issue>
 
@@ -811,7 +866,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="851"
+            line="991"
             column="62"/>
     </issue>
 
diff --git a/room/rxjava2/lint-baseline.xml b/room/rxjava2/lint-baseline.xml
index 5132856..a5de48f 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="PrivateConstructorForUtilityClass"
diff --git a/room/testing/lint-baseline.xml b/room/testing/lint-baseline.xml
index 46a9a26..7a7323f 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -96,7 +96,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="203"
+            line="205"
             column="12"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="203"
+            line="205"
             column="59"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="204"
+            line="206"
             column="44"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="252"
+            line="256"
             column="29"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="279"
+            line="283"
             column="35"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="296"
+            line="300"
             column="35"/>
     </issue>
 
diff --git a/security/crypto/lint-baseline.xml b/security/crypto/lint-baseline.xml
new file mode 100644
index 0000000..4dd9777
--- /dev/null
+++ b/security/crypto/lint-baseline.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/security/crypto/EncryptedFile.java"
+            line="350"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/security/crypto/EncryptedFile.java"
+            line="355"
+            column="9"/>
+    </issue>
+
+</issues>
diff --git a/sharetarget/sharetarget/lint-baseline.xml b/sharetarget/sharetarget/lint-baseline.xml
index 4d646e3..cd9a010 100644
--- a/sharetarget/sharetarget/lint-baseline.xml
+++ b/sharetarget/sharetarget/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/slices/benchmark/lint-baseline.xml b/slices/benchmark/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/slices/benchmark/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/slices/builders/lint-baseline.xml b/slices/builders/lint-baseline.xml
index 0fce397..5afd8e7 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -63,7 +63,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="424"
+            line="459"
             column="16"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="432"
+            line="467"
             column="16"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="440"
+            line="475"
             column="16"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="448"
+            line="483"
             column="16"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="456"
+            line="491"
             column="16"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                                                     ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="55"
+            line="56"
             column="70"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                      ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="79"
+            line="80"
             column="23"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                        ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="88"
+            line="89"
             column="25"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="105"
+            line="106"
             column="34"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                                 ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="112"
+            line="113"
             column="34"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="118"
+            line="119"
             column="39"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="143"
+            line="144"
             column="30"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="                          ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="216"
+            line="233"
             column="27"/>
     </issue>
 
diff --git a/slices/core/lint-baseline.xml b/slices/core/lint-baseline.xml
index ff6ad55..44d2df6 100644
--- a/slices/core/lint-baseline.xml
+++ b/slices/core/lint-baseline.xml
@@ -1,5 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    private synchronized void persist(PermissionState state) {"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/slice/compat/CompatPermissionManager.java"
+            line="107"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/slice/compat/CompatPinnedList.java"
+            line="97"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/slice/compat/CompatPinnedList.java"
+            line="143"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/slice/compat/CompatPinnedList.java"
+            line="160"
+            column="5"/>
+    </issue>
 
     <issue
         id="LambdaLast"
@@ -8,7 +52,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="396"
+            line="398"
             column="35"/>
     </issue>
 
@@ -261,7 +305,7 @@
         errorLine2="                 ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="182"
+            line="184"
             column="18"/>
     </issue>
 
@@ -272,7 +316,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="201"
+            line="203"
             column="12"/>
     </issue>
 
@@ -283,7 +327,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="229"
+            line="231"
             column="12"/>
     </issue>
 
@@ -294,7 +338,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="236"
+            line="238"
             column="12"/>
     </issue>
 
@@ -305,7 +349,7 @@
         errorLine2="           ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="245"
+            line="247"
             column="12"/>
     </issue>
 
@@ -316,7 +360,7 @@
         errorLine2="                      ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="252"
+            line="254"
             column="23"/>
     </issue>
 
@@ -327,7 +371,7 @@
         errorLine2="                      ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="260"
+            line="262"
             column="23"/>
     </issue>
 
@@ -338,7 +382,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="268"
+            line="270"
             column="39"/>
     </issue>
 
@@ -349,7 +393,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="336"
+            line="338"
             column="16"/>
     </issue>
 
@@ -360,7 +404,7 @@
         errorLine2="                               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="336"
+            line="338"
             column="32"/>
     </issue>
 
@@ -371,7 +415,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="344"
+            line="346"
             column="16"/>
     </issue>
 
@@ -382,7 +426,7 @@
         errorLine2="                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="344"
+            line="346"
             column="44"/>
     </issue>
 
@@ -393,7 +437,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="352"
+            line="354"
             column="16"/>
     </issue>
 
@@ -404,7 +448,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="352"
+            line="354"
             column="44"/>
     </issue>
 
@@ -415,7 +459,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="359"
+            line="361"
             column="16"/>
     </issue>
 
@@ -426,7 +470,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="369"
+            line="371"
             column="16"/>
     </issue>
 
@@ -437,7 +481,7 @@
         errorLine2="                                                         ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="369"
+            line="371"
             column="58"/>
     </issue>
 
@@ -448,7 +492,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="380"
+            line="382"
             column="16"/>
     </issue>
 
@@ -459,7 +503,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="395"
+            line="397"
             column="16"/>
     </issue>
 
@@ -470,7 +514,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="408"
+            line="410"
             column="16"/>
     </issue>
 
@@ -481,7 +525,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="408"
+            line="410"
             column="32"/>
     </issue>
 
@@ -492,7 +536,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="409"
+            line="411"
             column="28"/>
     </issue>
 
@@ -503,7 +547,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="419"
+            line="421"
             column="16"/>
     </issue>
 
@@ -514,7 +558,7 @@
         errorLine2="                               ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="419"
+            line="421"
             column="32"/>
     </issue>
 
@@ -525,7 +569,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="420"
+            line="422"
             column="28"/>
     </issue>
 
@@ -536,7 +580,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="429"
+            line="431"
             column="16"/>
     </issue>
 
@@ -547,7 +591,7 @@
         errorLine2="                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="429"
+            line="431"
             column="32"/>
     </issue>
 
@@ -558,7 +602,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="430"
+            line="432"
             column="28"/>
     </issue>
 
@@ -569,7 +613,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="443"
+            line="445"
             column="16"/>
     </issue>
 
@@ -580,7 +624,7 @@
         errorLine2="                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="443"
+            line="445"
             column="32"/>
     </issue>
 
@@ -591,7 +635,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="444"
+            line="446"
             column="28"/>
     </issue>
 
@@ -602,7 +646,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="459"
+            line="461"
             column="16"/>
     </issue>
 
@@ -613,7 +657,7 @@
         errorLine2="                                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="459"
+            line="461"
             column="45"/>
     </issue>
 
@@ -624,7 +668,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="460"
+            line="462"
             column="28"/>
     </issue>
 
@@ -635,7 +679,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="472"
+            line="474"
             column="16"/>
     </issue>
 
@@ -646,7 +690,7 @@
         errorLine2="                                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="472"
+            line="474"
             column="45"/>
     </issue>
 
@@ -657,7 +701,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="473"
+            line="475"
             column="28"/>
     </issue>
 
@@ -668,7 +712,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="484"
+            line="486"
             column="16"/>
     </issue>
 
@@ -679,7 +723,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="485"
+            line="487"
             column="28"/>
     </issue>
 
@@ -690,7 +734,7 @@
         errorLine2="               ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="495"
+            line="497"
             column="16"/>
     </issue>
 
@@ -701,7 +745,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="496"
+            line="498"
             column="28"/>
     </issue>
 
@@ -712,7 +756,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="505"
+            line="507"
             column="16"/>
     </issue>
 
@@ -723,7 +767,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="506"
+            line="508"
             column="28"/>
     </issue>
 
@@ -734,7 +778,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="516"
+            line="518"
             column="16"/>
     </issue>
 
@@ -745,7 +789,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="517"
+            line="519"
             column="28"/>
     </issue>
 
@@ -756,7 +800,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="528"
+            line="530"
             column="16"/>
     </issue>
 
@@ -767,7 +811,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="529"
+            line="531"
             column="28"/>
     </issue>
 
@@ -778,7 +822,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="539"
+            line="541"
             column="16"/>
     </issue>
 
@@ -789,7 +833,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="540"
+            line="542"
             column="28"/>
     </issue>
 
@@ -800,7 +844,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="549"
+            line="551"
             column="16"/>
     </issue>
 
@@ -811,7 +855,7 @@
         errorLine2="                                     ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="549"
+            line="551"
             column="38"/>
     </issue>
 
@@ -822,7 +866,7 @@
         errorLine2="               ~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="557"
+            line="559"
             column="16"/>
     </issue>
 
@@ -833,7 +877,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="575"
+            line="577"
             column="12"/>
     </issue>
 
@@ -844,7 +888,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="575"
+            line="577"
             column="28"/>
     </issue>
 
@@ -855,7 +899,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="600"
+            line="602"
             column="36"/>
     </issue>
 
@@ -866,7 +910,7 @@
         errorLine2="                                                     ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="600"
+            line="602"
             column="54"/>
     </issue>
 
@@ -877,7 +921,7 @@
         errorLine2="                                  ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="624"
+            line="626"
             column="35"/>
     </issue>
 
@@ -888,7 +932,7 @@
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/Slice.java"
-            line="625"
+            line="627"
             column="13"/>
     </issue>
 
diff --git a/slices/remotecallback/lint-baseline.xml b/slices/remotecallback/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/slices/remotecallback/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/slices/test/lint-baseline.xml b/slices/test/lint-baseline.xml
index 9d2c909..1f3f6e3 100644
--- a/slices/test/lint-baseline.xml
+++ b/slices/test/lint-baseline.xml
@@ -1,49 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
-
-    <issue
-        id="RestrictedApi"
-        message="MessagingSliceBuilder can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
-        errorLine1="        MessagingSliceBuilder b = new MessagingSliceBuilder(getContext(), sliceUri);"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="539"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="MessagingSliceBuilder.add can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
-        errorLine1="        return b.add(new MessagingSliceBuilder.MessageBuilder(b)"
-        errorLine2="                 ~~~">
-        <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="540"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="MessagingSliceBuilder.add can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
-        errorLine1="                .add(new MessagingSliceBuilder.MessageBuilder(b)"
-        errorLine2="                 ~~~">
-        <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="544"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="MessagingSliceBuilder.add can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
-        errorLine1="                .add(new MessagingSliceBuilder.MessageBuilder(b)"
-        errorLine2="                 ~~~">
-        <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="547"
-            column="18"/>
-    </issue>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -52,7 +8,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="125"
+            line="127"
             column="19"/>
     </issue>
 
@@ -63,7 +19,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="125"
+            line="127"
             column="30"/>
     </issue>
 
@@ -74,7 +30,7 @@
         errorLine2="                                          ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="125"
+            line="127"
             column="43"/>
     </issue>
 
@@ -85,7 +41,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="145"
+            line="147"
             column="12"/>
     </issue>
 
@@ -96,7 +52,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="576"
+            line="654"
             column="19"/>
     </issue>
 
diff --git a/slices/view/lint-baseline.xml b/slices/view/lint-baseline.xml
index ba0c7ab..623383b 100644
--- a/slices/view/lint-baseline.xml
+++ b/slices/view/lint-baseline.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        /**"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/slice/widget/SliceLiveData.java"
+            line="210"
+            column="9"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
@@ -19,7 +30,7 @@
         errorLine2="                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridContent.java"
-            line="66"
+            line="67"
             column="24"/>
     </issue>
 
@@ -30,7 +41,7 @@
         errorLine2="                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridContent.java"
-            line="227"
+            line="228"
             column="26"/>
     </issue>
 
@@ -41,7 +52,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridContent.java"
-            line="227"
+            line="228"
             column="44"/>
     </issue>
 
@@ -52,7 +63,7 @@
         errorLine2="                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridContent.java"
-            line="245"
+            line="247"
             column="28"/>
     </issue>
 
@@ -63,7 +74,7 @@
         errorLine2="                                ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridContent.java"
-            line="252"
+            line="254"
             column="33"/>
     </issue>
 
@@ -74,7 +85,7 @@
         errorLine2="               ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridContent.java"
-            line="305"
+            line="321"
             column="16"/>
     </issue>
 
@@ -85,7 +96,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridContent.java"
-            line="312"
+            line="328"
             column="16"/>
     </issue>
 
@@ -151,7 +162,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="495"
+            line="524"
             column="25"/>
     </issue>
 
@@ -162,7 +173,7 @@
         errorLine2="                           ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="516"
+            line="545"
             column="28"/>
     </issue>
 
@@ -173,7 +184,7 @@
         errorLine2="                                      ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="516"
+            line="545"
             column="39"/>
     </issue>
 
@@ -213,8 +224,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 ArrayList&lt;SliceContent> getRowItems(int availableHeight, SliceStyle style,"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    public List&lt;SliceContent> getRowItems(int availableHeight, SliceStyle style,"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
             line="144"
@@ -224,12 +235,12 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public ArrayList&lt;SliceContent> getRowItems(int availableHeight, SliceStyle style,"
-        errorLine2="                                                                    ~~~~~~~~~~">
+        errorLine1="    public List&lt;SliceContent> getRowItems(int availableHeight, SliceStyle style,"
+        errorLine2="                                                               ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/ListContent.java"
             line="144"
-            column="69"/>
+            column="64"/>
     </issue>
 
     <issue
@@ -723,7 +734,7 @@
         errorLine2="                    ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowStyle.java"
-            line="54"
+            line="56"
             column="21"/>
     </issue>
 
@@ -734,7 +745,7 @@
         errorLine2="              ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="134"
+            line="136"
             column="15"/>
     </issue>
 
@@ -745,7 +756,7 @@
         errorLine2="                   ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="182"
+            line="185"
             column="20"/>
     </issue>
 
@@ -756,7 +767,7 @@
         errorLine2="                         ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="208"
+            line="211"
             column="26"/>
     </issue>
 
@@ -767,7 +778,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="314"
+            line="317"
             column="33"/>
     </issue>
 
@@ -778,7 +789,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="408"
+            line="411"
             column="30"/>
     </issue>
 
@@ -789,7 +800,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="409"
+            line="412"
             column="27"/>
     </issue>
 
@@ -800,7 +811,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="990"
+            line="1002"
             column="35"/>
     </issue>
 
@@ -811,7 +822,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1002"
+            line="1014"
             column="25"/>
     </issue>
 
@@ -822,7 +833,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1041"
+            line="1053"
             column="32"/>
     </issue>
 
@@ -833,7 +844,7 @@
         errorLine2="                                                      ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1041"
+            line="1053"
             column="55"/>
     </issue>
 
@@ -844,7 +855,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/RowView.java"
-            line="1076"
+            line="1088"
             column="35"/>
     </issue>
 
@@ -895,22 +906,33 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public SliceActionView(Context context) {"
+        errorLine1="    public SliceActionView(Context context, SliceStyle style) {"
         errorLine2="                           ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="80"
+            line="83"
             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 SliceActionView(Context context, SliceStyle style) {"
+        errorLine2="                                            ~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/slice/widget/SliceActionView.java"
+            line="83"
+            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 setAction(@NonNull SliceActionImpl action, EventInfo info,"
         errorLine2="                                                           ~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="90"
+            line="100"
             column="60"/>
     </issue>
 
@@ -921,7 +943,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="91"
+            line="101"
             column="13"/>
     </issue>
 
@@ -932,7 +954,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="92"
+            line="102"
             column="13"/>
     </issue>
 
@@ -943,24 +965,13 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="219"
+            line="233"
             column="25"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown 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 onCheckedChanged(CompoundButton buttonView, boolean isChecked) {"
-        errorLine2="                                 ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/slice/widget/SliceActionView.java"
-            line="227"
-            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 SliceAdapter(Context context) {"
         errorLine2="                        ~~~~~~~">
         <location
@@ -1130,7 +1141,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceAdapter.java"
-            line="352"
+            line="353"
             column="29"/>
     </issue>
 
@@ -1141,7 +1152,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceAdapter.java"
-            line="360"
+            line="361"
             column="32"/>
     </issue>
 
@@ -1152,7 +1163,7 @@
         errorLine2="                                       ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceAdapter.java"
-            line="360"
+            line="361"
             column="40"/>
     </issue>
 
@@ -1548,7 +1559,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="83"
+            line="84"
             column="23"/>
     </issue>
 
@@ -1559,7 +1570,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="83"
+            line="84"
             column="40"/>
     </issue>
 
@@ -1570,7 +1581,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="228"
+            line="250"
             column="12"/>
     </issue>
 
@@ -1581,7 +1592,7 @@
         errorLine2="                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="240"
+            line="270"
             column="29"/>
     </issue>
 
@@ -1592,7 +1603,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="240"
+            line="270"
             column="45"/>
     </issue>
 
@@ -1603,7 +1614,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="274"
+            line="304"
             column="30"/>
     </issue>
 
@@ -1614,7 +1625,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="274"
+            line="304"
             column="48"/>
     </issue>
 
@@ -1625,7 +1636,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="302"
+            line="332"
             column="30"/>
     </issue>
 
@@ -1636,7 +1647,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="302"
+            line="332"
             column="48"/>
     </issue>
 
@@ -1647,7 +1658,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="332"
+            line="362"
             column="35"/>
     </issue>
 
@@ -1658,7 +1669,7 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="332"
+            line="362"
             column="65"/>
     </issue>
 
@@ -1669,7 +1680,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="361"
+            line="389"
             column="68"/>
     </issue>
 
@@ -1680,7 +1691,7 @@
         errorLine2="                                                                    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceStyle.java"
-            line="363"
+            line="391"
             column="69"/>
     </issue>
 
@@ -2010,7 +2021,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceView.java"
-            line="820"
+            line="823"
             column="19"/>
     </issue>
 
@@ -2021,7 +2032,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/slice/widget/SliceView.java"
-            line="861"
+            line="864"
             column="40"/>
     </issue>
 
diff --git a/slidingpanelayout/slidingpanelayout/lint-baseline.xml b/slidingpanelayout/slidingpanelayout/lint-baseline.xml
index 07e26fff..4a01220 100644
--- a/slidingpanelayout/slidingpanelayout/lint-baseline.xml
+++ b/slidingpanelayout/slidingpanelayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/sqlite/sqlite-framework/lint-baseline.xml b/sqlite/sqlite-framework/lint-baseline.xml
new file mode 100644
index 0000000..884a4d6
--- /dev/null
+++ b/sqlite/sqlite-framework/lint-baseline.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized SupportSQLiteDatabase getWritableSupportDatabase() {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.java"
+            line="143"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        synchronized SupportSQLiteDatabase getReadableSupportDatabase() {"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.java"
+            line="154"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="        @Override"
+        errorLine2="        ^">
+        <location
+            file="src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.java"
+            line="199"
+            column="9"/>
+    </issue>
+
+</issues>
diff --git a/sqlite/sqlite/lint-baseline.xml b/sqlite/sqlite/lint-baseline.xml
index 5aca6ad..51df956 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/swiperefreshlayout/swiperefreshlayout/lint-baseline.xml b/swiperefreshlayout/swiperefreshlayout/lint-baseline.xml
index 98d474d..d23b92d 100644
--- a/swiperefreshlayout/swiperefreshlayout/lint-baseline.xml
+++ b/swiperefreshlayout/swiperefreshlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="KotlinPropertyAccess"
@@ -45,7 +45,7 @@
         errorLine2="              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="280"
+            line="279"
             column="15"/>
     </issue>
 
@@ -56,7 +56,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="286"
+            line="285"
             column="43"/>
     </issue>
 
@@ -67,7 +67,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="608"
+            line="607"
             column="42"/>
     </issue>
 
@@ -78,7 +78,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="619"
+            line="618"
             column="51"/>
     </issue>
 
@@ -89,7 +89,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="635"
+            line="634"
             column="48"/>
     </issue>
 
@@ -100,7 +100,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="755"
+            line="754"
             column="42"/>
     </issue>
 
@@ -111,7 +111,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="911"
+            line="902"
             column="40"/>
     </issue>
 
@@ -122,7 +122,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="911"
+            line="902"
             column="52"/>
     </issue>
 
@@ -133,7 +133,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="920"
+            line="911"
             column="40"/>
     </issue>
 
@@ -144,7 +144,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="920"
+            line="911"
             column="52"/>
     </issue>
 
@@ -155,7 +155,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="929"
+            line="920"
             column="36"/>
     </issue>
 
@@ -166,7 +166,7 @@
         errorLine2="                               ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="938"
+            line="929"
             column="32"/>
     </issue>
 
@@ -177,7 +177,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="945"
+            line="936"
             column="35"/>
     </issue>
 
@@ -188,7 +188,7 @@
         errorLine2="                                                               ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="945"
+            line="936"
             column="64"/>
     </issue>
 
@@ -199,7 +199,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="956"
+            line="947"
             column="40"/>
     </issue>
 
@@ -210,7 +210,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="956"
+            line="947"
             column="52"/>
     </issue>
 
@@ -221,7 +221,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="962"
+            line="953"
             column="40"/>
     </issue>
 
@@ -232,7 +232,7 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="962"
+            line="953"
             column="52"/>
     </issue>
 
@@ -243,7 +243,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="972"
+            line="963"
             column="35"/>
     </issue>
 
@@ -254,7 +254,7 @@
         errorLine2="                                                               ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="972"
+            line="963"
             column="64"/>
     </issue>
 
@@ -265,7 +265,7 @@
         errorLine2="                                   ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1009"
+            line="1000"
             column="36"/>
     </issue>
 
@@ -276,7 +276,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1023"
+            line="1014"
             column="38"/>
     </issue>
 
@@ -287,7 +287,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1030"
+            line="1021"
             column="37"/>
     </issue>
 
@@ -298,7 +298,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1036"
+            line="1027"
             column="34"/>
     </issue>
 
@@ -309,7 +309,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1074"
+            line="1065"
             column="31"/>
     </issue>
 
@@ -320,7 +320,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1080"
+            line="1071"
             column="60"/>
     </issue>
 
@@ -331,7 +331,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1080"
+            line="1071"
             column="76"/>
     </issue>
 
@@ -342,7 +342,7 @@
         errorLine2="                              ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1115"
+            line="1106"
             column="31"/>
     </issue>
 
@@ -353,7 +353,7 @@
         errorLine2="                                                           ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1121"
+            line="1112"
             column="60"/>
     </issue>
 
@@ -364,7 +364,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1121"
+            line="1112"
             column="76"/>
     </issue>
 
@@ -375,7 +375,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="1226"
+            line="1217"
             column="33"/>
     </issue>
 
diff --git a/testutils/testutils-appcompat/lint-baseline.xml b/testutils/testutils-appcompat/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/testutils/testutils-appcompat/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/testutils/testutils-common/lint-baseline.xml b/testutils/testutils-common/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/testutils/testutils-common/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/testutils/testutils-espresso/lint-baseline.xml b/testutils/testutils-espresso/lint-baseline.xml
index dc7606a..f01d19e 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/testutils/testutils-gradle-plugin/lint-baseline.xml b/testutils/testutils-gradle-plugin/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/testutils/testutils-gradle-plugin/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/testutils/testutils-ktx/lint-baseline.xml b/testutils/testutils-ktx/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/testutils/testutils-ktx/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/testutils/testutils-navigation/lint-baseline.xml b/testutils/testutils-navigation/lint-baseline.xml
new file mode 100644
index 0000000..f67a956
--- /dev/null
+++ b/testutils/testutils-navigation/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+</issues>
diff --git a/testutils/testutils-paging/lint-baseline.xml b/testutils/testutils-paging/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/testutils/testutils-paging/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/testutils/testutils-runtime/lint-baseline.xml b/testutils/testutils-runtime/lint-baseline.xml
index b8a1dc6..659eb6a 100644
--- a/testutils/testutils-runtime/lint-baseline.xml
+++ b/testutils/testutils-runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
diff --git a/testutils/testutils-truth/lint-baseline.xml b/testutils/testutils-truth/lint-baseline.xml
new file mode 100644
index 0000000..09beb7c
--- /dev/null
+++ b/testutils/testutils-truth/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+</issues>
diff --git a/textclassifier/textclassifier/lint-baseline.xml b/textclassifier/textclassifier/lint-baseline.xml
index a711052..259aa7f 100644
--- a/textclassifier/textclassifier/lint-baseline.xml
+++ b/textclassifier/textclassifier/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/transition/transition/lint-baseline.xml b/transition/transition/lint-baseline.xml
index ea9fa57..3edb5b1 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 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="PrivateConstructorForUtilityClass"
diff --git a/tv-provider/tv-provider/lint-baseline.xml b/tv-provider/tv-provider/lint-baseline.xml
index bbe5702..198463c 100644
--- a/tv-provider/tv-provider/lint-baseline.xml
+++ b/tv-provider/tv-provider/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="PrivateConstructorForUtilityClass"
@@ -19,7 +19,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="159"
+            line="158"
             column="12"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="167"
+            line="166"
             column="12"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="195"
+            line="194"
             column="12"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="204"
+            line="203"
             column="12"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="258"
+            line="257"
             column="12"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="276"
+            line="275"
             column="12"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="284"
+            line="283"
             column="12"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="292"
+            line="291"
             column="12"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="336"
+            line="335"
             column="12"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="353"
+            line="352"
             column="12"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="363"
+            line="362"
             column="12"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="371"
+            line="370"
             column="12"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="397"
+            line="396"
             column="12"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="415"
+            line="414"
             column="12"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="427"
+            line="426"
             column="12"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="648"
+            line="647"
             column="24"/>
     </issue>
 
@@ -195,7 +195,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="660"
+            line="659"
             column="16"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="660"
+            line="659"
             column="40"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="672"
+            line="671"
             column="16"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="                                    ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="672"
+            line="671"
             column="37"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="686"
+            line="685"
             column="16"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="698"
+            line="697"
             column="16"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="710"
+            line="709"
             column="16"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                              ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="710"
+            line="709"
             column="31"/>
     </issue>
 
@@ -283,7 +283,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="722"
+            line="721"
             column="16"/>
     </issue>
 
@@ -294,7 +294,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="722"
+            line="721"
             column="28"/>
     </issue>
 
@@ -305,7 +305,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="733"
+            line="732"
             column="16"/>
     </issue>
 
@@ -316,7 +316,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="760"
+            line="759"
             column="16"/>
     </issue>
 
@@ -327,7 +327,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="783"
+            line="782"
             column="16"/>
     </issue>
 
@@ -338,7 +338,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="805"
+            line="804"
             column="16"/>
     </issue>
 
@@ -349,7 +349,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="817"
+            line="816"
             column="16"/>
     </issue>
 
@@ -360,7 +360,7 @@
         errorLine2="                            ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="817"
+            line="816"
             column="29"/>
     </issue>
 
@@ -371,7 +371,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="842"
+            line="841"
             column="16"/>
     </issue>
 
@@ -382,7 +382,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="854"
+            line="853"
             column="16"/>
     </issue>
 
@@ -393,7 +393,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="854"
+            line="853"
             column="35"/>
     </issue>
 
@@ -404,7 +404,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="866"
+            line="865"
             column="16"/>
     </issue>
 
@@ -415,7 +415,7 @@
         errorLine2="                               ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="866"
+            line="865"
             column="32"/>
     </issue>
 
@@ -426,7 +426,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="881"
+            line="880"
             column="16"/>
     </issue>
 
@@ -437,7 +437,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="881"
+            line="880"
             column="33"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="893"
+            line="892"
             column="16"/>
     </issue>
 
@@ -459,7 +459,7 @@
         errorLine2="                                ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="893"
+            line="892"
             column="33"/>
     </issue>
 
@@ -470,7 +470,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="905"
+            line="904"
             column="16"/>
     </issue>
 
@@ -481,7 +481,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="917"
+            line="916"
             column="16"/>
     </issue>
 
@@ -492,7 +492,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="943"
+            line="942"
             column="16"/>
     </issue>
 
@@ -503,7 +503,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="955"
+            line="954"
             column="16"/>
     </issue>
 
@@ -514,7 +514,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="967"
+            line="966"
             column="16"/>
     </issue>
 
@@ -525,7 +525,7 @@
         errorLine2="                           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="967"
+            line="966"
             column="28"/>
     </issue>
 
@@ -536,7 +536,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="981"
+            line="980"
             column="16"/>
     </issue>
 
@@ -547,7 +547,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="993"
+            line="992"
             column="16"/>
     </issue>
 
@@ -558,7 +558,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="993"
+            line="992"
             column="31"/>
     </issue>
 
@@ -569,7 +569,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1008"
+            line="1007"
             column="16"/>
     </issue>
 
@@ -580,7 +580,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1008"
+            line="1007"
             column="44"/>
     </issue>
 
@@ -591,7 +591,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1020"
+            line="1019"
             column="16"/>
     </issue>
 
@@ -602,7 +602,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1020"
+            line="1019"
             column="27"/>
     </issue>
 
@@ -613,7 +613,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1033"
+            line="1032"
             column="16"/>
     </issue>
 
@@ -624,7 +624,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1045"
+            line="1044"
             column="16"/>
     </issue>
 
@@ -635,7 +635,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1057"
+            line="1056"
             column="16"/>
     </issue>
 
@@ -646,7 +646,7 @@
         errorLine2="                                    ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1057"
+            line="1056"
             column="37"/>
     </issue>
 
@@ -657,7 +657,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1069"
+            line="1068"
             column="16"/>
     </issue>
 
@@ -668,7 +668,7 @@
         errorLine2="              ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="73"
+            line="74"
             column="15"/>
     </issue>
 
@@ -679,7 +679,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="95"
+            line="96"
             column="12"/>
     </issue>
 
@@ -690,7 +690,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="103"
+            line="104"
             column="12"/>
     </issue>
 
@@ -701,7 +701,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="111"
+            line="112"
             column="12"/>
     </issue>
 
@@ -712,7 +712,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="120"
+            line="121"
             column="12"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="133"
+            line="134"
             column="12"/>
     </issue>
 
@@ -734,7 +734,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="145"
+            line="146"
             column="12"/>
     </issue>
 
@@ -745,7 +745,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="153"
+            line="154"
             column="12"/>
     </issue>
 
@@ -756,7 +756,7 @@
         errorLine2="                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="179"
+            line="180"
             column="19"/>
     </issue>
 
@@ -767,7 +767,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="187"
+            line="188"
             column="12"/>
     </issue>
 
@@ -778,7 +778,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="196"
+            line="197"
             column="12"/>
     </issue>
 
@@ -789,7 +789,7 @@
         errorLine2="           ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="205"
+            line="206"
             column="12"/>
     </issue>
 
@@ -800,7 +800,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="214"
+            line="215"
             column="12"/>
     </issue>
 
@@ -811,7 +811,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="222"
+            line="223"
             column="12"/>
     </issue>
 
@@ -822,7 +822,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="240"
+            line="241"
             column="12"/>
     </issue>
 
@@ -833,7 +833,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="248"
+            line="249"
             column="12"/>
     </issue>
 
@@ -844,7 +844,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="256"
+            line="257"
             column="12"/>
     </issue>
 
@@ -855,7 +855,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="264"
+            line="265"
             column="12"/>
     </issue>
 
@@ -866,7 +866,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="272"
+            line="273"
             column="12"/>
     </issue>
 
@@ -877,7 +877,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="289"
+            line="290"
             column="12"/>
     </issue>
 
@@ -888,7 +888,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="315"
+            line="326"
             column="12"/>
     </issue>
 
@@ -899,7 +899,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="529"
+            line="545"
             column="19"/>
     </issue>
 
@@ -910,7 +910,7 @@
         errorLine2="                       ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="542"
+            line="558"
             column="24"/>
     </issue>
 
@@ -921,7 +921,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="553"
+            line="569"
             column="16"/>
     </issue>
 
@@ -932,7 +932,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="567"
+            line="583"
             column="16"/>
     </issue>
 
@@ -943,7 +943,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="567"
+            line="583"
             column="33"/>
     </issue>
 
@@ -954,7 +954,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="579"
+            line="595"
             column="16"/>
     </issue>
 
@@ -965,7 +965,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="579"
+            line="595"
             column="27"/>
     </issue>
 
@@ -976,7 +976,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="591"
+            line="607"
             column="16"/>
     </issue>
 
@@ -987,7 +987,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="591"
+            line="607"
             column="34"/>
     </issue>
 
@@ -998,7 +998,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="603"
+            line="619"
             column="16"/>
     </issue>
 
@@ -1009,28 +1009,6 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="620"
-            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 T setSeasonNumber(String seasonNumber, int numericalSeasonNumber) {"
-        errorLine2="                                 ~~~~~~">
-        <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="620"
-            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 T setEpisodeNumber(int episodeNumber) {"
-        errorLine2="               ~">
-        <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
             line="636"
             column="16"/>
     </issue>
@@ -1038,11 +1016,33 @@
     <issue
         id="UnknownNullness"
         message="Unknown 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 setSeasonNumber(String seasonNumber, int numericalSeasonNumber) {"
+        errorLine2="                                 ~~~~~~">
+        <location
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
+            line="636"
+            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 T setEpisodeNumber(int episodeNumber) {"
+        errorLine2="               ~">
+        <location
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
+            line="652"
+            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 T setEpisodeNumber(String episodeNumber, int numericalEpisodeNumber) {"
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="653"
+            line="669"
             column="16"/>
     </issue>
 
@@ -1053,7 +1053,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="653"
+            line="669"
             column="35"/>
     </issue>
 
@@ -1064,7 +1064,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="670"
+            line="686"
             column="16"/>
     </issue>
 
@@ -1075,7 +1075,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="670"
+            line="686"
             column="33"/>
     </issue>
 
@@ -1086,7 +1086,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="682"
+            line="698"
             column="16"/>
     </issue>
 
@@ -1097,7 +1097,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="682"
+            line="698"
             column="37"/>
     </issue>
 
@@ -1108,7 +1108,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="694"
+            line="710"
             column="16"/>
     </issue>
 
@@ -1119,7 +1119,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="706"
+            line="722"
             column="16"/>
     </issue>
 
@@ -1130,7 +1130,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="720"
+            line="736"
             column="16"/>
     </issue>
 
@@ -1141,7 +1141,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="720"
+            line="736"
             column="36"/>
     </issue>
 
@@ -1152,7 +1152,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="733"
+            line="749"
             column="16"/>
     </issue>
 
@@ -1163,7 +1163,7 @@
         errorLine2="                                 ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="733"
+            line="749"
             column="34"/>
     </issue>
 
@@ -1174,7 +1174,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="746"
+            line="762"
             column="16"/>
     </issue>
 
@@ -1185,7 +1185,7 @@
         errorLine2="                                 ~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="746"
+            line="762"
             column="34"/>
     </issue>
 
@@ -1196,7 +1196,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="761"
+            line="777"
             column="16"/>
     </issue>
 
@@ -1207,7 +1207,7 @@
         errorLine2="                                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="761"
+            line="777"
             column="44"/>
     </issue>
 
@@ -1218,7 +1218,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="773"
+            line="789"
             column="16"/>
     </issue>
 
@@ -1229,7 +1229,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="773"
+            line="789"
             column="42"/>
     </issue>
 
@@ -1240,7 +1240,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="785"
+            line="801"
             column="16"/>
     </issue>
 
@@ -1251,7 +1251,7 @@
         errorLine2="                                   ~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="785"
+            line="801"
             column="36"/>
     </issue>
 
@@ -1262,7 +1262,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="798"
+            line="814"
             column="16"/>
     </issue>
 
@@ -1273,7 +1273,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="810"
+            line="826"
             column="16"/>
     </issue>
 
@@ -1284,7 +1284,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="822"
+            line="838"
             column="16"/>
     </issue>
 
@@ -1295,7 +1295,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="834"
+            line="850"
             column="16"/>
     </issue>
 
@@ -1306,7 +1306,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="846"
+            line="862"
             column="16"/>
     </issue>
 
@@ -1317,7 +1317,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="863"
+            line="879"
             column="16"/>
     </issue>
 
@@ -1328,7 +1328,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="888"
+            line="904"
             column="16"/>
     </issue>
 
@@ -1339,7 +1339,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="888"
+            line="904"
             column="34"/>
     </issue>
 
@@ -1350,7 +1350,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="900"
+            line="916"
             column="16"/>
     </issue>
 
@@ -1361,7 +1361,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="900"
+            line="916"
             column="33"/>
     </issue>
 
@@ -3220,7 +3220,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="1872"
+            line="1883"
             column="62"/>
     </issue>
 
@@ -3231,7 +3231,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2634"
+            line="2645"
             column="27"/>
     </issue>
 
@@ -3242,7 +3242,7 @@
         errorLine2="                                 ~~~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2673"
+            line="2684"
             column="34"/>
     </issue>
 
@@ -3253,7 +3253,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2721"
+            line="2732"
             column="47"/>
     </issue>
 
diff --git a/vectordrawable/vectordrawable-animated/lint-baseline.xml b/vectordrawable/vectordrawable-animated/lint-baseline.xml
index d9494f3..49daeaa 100644
--- a/vectordrawable/vectordrawable-animated/lint-baseline.xml
+++ b/vectordrawable/vectordrawable-animated/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
diff --git a/vectordrawable/vectordrawable/lint-baseline.xml b/vectordrawable/vectordrawable/lint-baseline.xml
index 6878b9e..bd95ef7 100644
--- a/vectordrawable/vectordrawable/lint-baseline.xml
+++ b/vectordrawable/vectordrawable/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
diff --git a/versionedparcelable/versionedparcelable-compiler/lint-baseline.xml b/versionedparcelable/versionedparcelable-compiler/lint-baseline.xml
new file mode 100644
index 0000000..54d4e3a
--- /dev/null
+++ b/versionedparcelable/versionedparcelable-compiler/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @Override"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/versionedparcelable/compiler/VersionedParcelProcessor.java"
+            line="85"
+            column="5"/>
+    </issue>
+
+</issues>
diff --git a/versionedparcelable/versionedparcelable/lint-baseline.xml b/versionedparcelable/versionedparcelable/lint-baseline.xml
index cb5abb4..5a39721 100644
--- a/versionedparcelable/versionedparcelable/lint-baseline.xml
+++ b/versionedparcelable/versionedparcelable/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
diff --git a/viewpager/viewpager/lint-baseline.xml b/viewpager/viewpager/lint-baseline.xml
index 22e7fff..c22d7d0 100644
--- a/viewpager/viewpager/lint-baseline.xml
+++ b/viewpager/viewpager/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="LambdaLast"
diff --git a/viewpager2/viewpager2/lint-baseline.xml b/viewpager2/viewpager2/lint-baseline.xml
index b175d01..e9b1f37 100644
--- a/viewpager2/viewpager2/lint-baseline.xml
+++ b/viewpager2/viewpager2/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="UnknownNullness"
@@ -8,7 +8,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="284"
+            line="291"
             column="12"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="326"
+            line="333"
             column="43"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="361"
+            line="368"
             column="49"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="485"
+            line="492"
             column="29"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="945"
+            line="952"
             column="51"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="952"
+            line="959"
             column="59"/>
     </issue>
 
diff --git a/wear/wear/lint-baseline.xml b/wear/wear/lint-baseline.xml
index b0286bd..fbf3e5b 100644
--- a/wear/wear/lint-baseline.xml
+++ b/wear/wear/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="KotlinPropertyAccess"
@@ -1762,7 +1762,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="219"
+            line="222"
             column="40"/>
     </issue>
 
@@ -1773,7 +1773,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="235"
+            line="238"
             column="44"/>
     </issue>
 
@@ -1784,7 +1784,7 @@
         errorLine2="           ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableActionDrawerView.java"
-            line="317"
+            line="320"
             column="12"/>
     </issue>
 
@@ -1905,7 +1905,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="324"
+            line="323"
             column="12"/>
     </issue>
 
@@ -1916,7 +1916,7 @@
         errorLine2="                                            ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="324"
+            line="323"
             column="45"/>
     </issue>
 
@@ -1927,7 +1927,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="498"
+            line="497"
             column="42"/>
     </issue>
 
@@ -1938,7 +1938,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="517"
+            line="516"
             column="33"/>
     </issue>
 
@@ -1949,7 +1949,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="540"
+            line="539"
             column="25"/>
     </issue>
 
@@ -1960,7 +1960,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="540"
+            line="539"
             column="48"/>
     </issue>
 
@@ -1971,7 +1971,7 @@
         errorLine2="            ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="574"
+            line="573"
             column="13"/>
     </issue>
 
@@ -1982,7 +1982,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="601"
+            line="600"
             column="40"/>
     </issue>
 
@@ -1993,7 +1993,7 @@
         errorLine2="                                ~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="639"
+            line="638"
             column="33"/>
     </issue>
 
@@ -2004,7 +2004,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="919"
+            line="918"
             column="36"/>
     </issue>
 
@@ -2015,7 +2015,7 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="919"
+            line="918"
             column="65"/>
     </issue>
 
@@ -2026,7 +2026,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="925"
+            line="924"
             column="36"/>
     </issue>
 
@@ -2037,7 +2037,7 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="925"
+            line="924"
             column="65"/>
     </issue>
 
@@ -2048,7 +2048,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/widget/drawer/WearableDrawerLayout.java"
-            line="933"
+            line="932"
             column="42"/>
     </issue>
 
diff --git a/webkit/webkit/lint-baseline.xml b/webkit/webkit/lint-baseline.xml
index a61aa6e..876cc27 100644
--- a/webkit/webkit/lint-baseline.xml
+++ b/webkit/webkit/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
 
     <issue
         id="KotlinPropertyAccess"
@@ -74,7 +74,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="46"
+            line="45"
             column="31"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="50"
+            line="49"
             column="31"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="129"
+            line="126"
             column="39"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="153"
+            line="149"
             column="12"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="158"
+            line="154"
             column="12"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="167"
+            line="163"
             column="56"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="182"
+            line="178"
             column="50"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                                      ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="196"
+            line="192"
             column="55"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                                                            ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
-            line="208"
+            line="204"
             column="61"/>
     </issue>
 
diff --git a/work/workmanager/lint-baseline.xml b/work/workmanager/lint-baseline.xml
index 297ee99..6d2d71f 100644
--- a/work/workmanager/lint-baseline.xml
+++ b/work/workmanager/lint-baseline.xml
@@ -1,5 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0-alpha08" client="gradle" variant="debug" version="4.1.0-alpha08">
+<issues format="5" by="lint 4.2.0-alpha06" client="gradle" variant="debug" version="4.2.0-alpha06">
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="                            @Override"
+        errorLine2="                            ^">
+        <location
+            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"
+            line="226"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/work/Logger.java"
+            line="41"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/work/Logger.java"
+            line="65"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/work/impl/constraints/trackers/Trackers.java"
+            line="34"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    /**"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/work/impl/constraints/trackers/Trackers.java"
+            line="48"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @VisibleForTesting"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/work/impl/utils/WorkTimer.java"
+            line="123"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="BanSynchronizedMethods"
+        message="Use of synchronized methods is not recommended"
+        errorLine1="    @VisibleForTesting"
+        errorLine2="    ^">
+        <location
+            file="src/main/java/androidx/work/impl/utils/WorkTimer.java"
+            line="129"
+            column="5"/>
+    </issue>
 
     <issue
         id="KotlinPropertyAccess"
@@ -544,7 +621,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="236"
+            line="269"
             column="31"/>
     </issue>
 
@@ -555,7 +632,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/utils/ForceStopRunnable.java"
-            line="236"
+            line="269"
             column="48"/>
     </issue>
 
@@ -1028,7 +1105,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/work/impl/constraints/trackers/NetworkStateTracker.java"
-            line="79"
+            line="80"
             column="12"/>
     </issue>