Remove line and position from lint baselines

Bug: 232550720
Test: ./gradlew lintDebug
Change-Id: I095a8a40e46b5c371afb5d8a54ce8e4f312cddf4
diff --git a/activity/activity/lint-baseline.xml b/activity/activity/lint-baseline.xml
index 57e0a5f..ca95aae 100644
--- a/activity/activity/lint-baseline.xml
+++ b/activity/activity/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    getExtensionVersion(Build.VERSION_CODES.R) >= 2"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"
-            line="626"
-            column="21"/>
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                    getExtensionVersion(Build.VERSION_CODES.R) >= 2"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"
-            line="626"
-            column="21"/>
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                    require(maxItems &lt;= MediaStore.getPickImagesMaxLimit()) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"
-            line="734"
-            column="52"/>
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                MediaStore.getPickImagesMaxLimit()"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"
-            line="779"
-            column="28"/>
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                    getExtensionVersion(Build.VERSION_CODES.R) >= 2"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"
-            line="626"
-            column="21"/>
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                    getExtensionVersion(Build.VERSION_CODES.R) >= 2"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"
-            line="626"
-            column="21"/>
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                    require(maxItems &lt;= MediaStore.getPickImagesMaxLimit()) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"
-            line="734"
-            column="52"/>
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                MediaStore.getPickImagesMaxLimit()"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"
-            line="779"
-            column="28"/>
+            file="src/main/java/androidx/activity/result/contract/ActivityResultContracts.kt"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            mOnBackPressedDispatcher.setOnBackInvokedDispatcher(getOnBackInvokedDispatcher());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/ComponentActivity.java"
-            line="357"
-            column="65"/>
+            file="src/main/java/androidx/activity/ComponentActivity.java"/>
     </issue>
 
 </issues>
\ No newline at end of file
diff --git a/activity/integration-tests/testapp/lint-baseline.xml b/activity/integration-tests/testapp/lint-baseline.xml
index 51d169b..cba2783 100644
--- a/activity/integration-tests/testapp/lint-baseline.xml
+++ b/activity/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    val takePicture = registerForActivityResult(TakePicture()) { success ->"
         errorLine2="        ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/activity/integration/testapp/MainActivity.kt"
-            line="64"
-            column="9"/>
+            file="src/main/java/androidx/activity/integration/testapp/MainActivity.kt"/>
     </issue>
 
 </issues>
diff --git a/ads/ads-identifier-common/lint-baseline.xml b/ads/ads-identifier-common/lint-baseline.xml
index f69b44a..ed36cbc 100644
--- a/ads/ads-identifier-common/lint-baseline.xml
+++ b/ads/ads-identifier-common/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="public class AdvertisingIdUtils {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/ads/identifier/AdvertisingIdUtils.java"
-            line="42"
-            column="14"/>
+            file="src/main/java/androidx/ads/identifier/AdvertisingIdUtils.java"/>
     </issue>
 
 </issues>
diff --git a/ads/ads-identifier-provider/integration-tests/testapp/lint-baseline.xml b/ads/ads-identifier-provider/integration-tests/testapp/lint-baseline.xml
index 981f1e6..9702a61 100644
--- a/ads/ads-identifier-provider/integration-tests/testapp/lint-baseline.xml
+++ b/ads/ads-identifier-provider/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/ads/identifier/provider/testapp/AdsIdentifierProviderActivity.java"
-            line="44"
-            column="29"/>
+            file="src/main/java/androidx/ads/identifier/provider/testapp/AdsIdentifierProviderActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void listProviders(View view) {"
         errorLine2="                              ~~~~">
         <location
-            file="src/main/java/androidx/ads/identifier/provider/testapp/AdsIdentifierProviderActivity.java"
-            line="56"
-            column="31"/>
+            file="src/main/java/androidx/ads/identifier/provider/testapp/AdsIdentifierProviderActivity.java"/>
     </issue>
 
 </issues>
diff --git a/annotation/annotation-experimental-lint/integration-tests/lint-baseline.xml b/annotation/annotation-experimental-lint/integration-tests/lint-baseline.xml
index 00a84e0..a4b68bb 100644
--- a/annotation/annotation-experimental-lint/integration-tests/lint-baseline.xml
+++ b/annotation/annotation-experimental-lint/integration-tests/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="public @interface ExperimentalJavaAnnotationWrongRetention {}"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/ExperimentalJavaAnnotationWrongRetention.java"
-            line="28"
-            column="19"/>
+            file="src/main/java/sample/optin/ExperimentalJavaAnnotationWrongRetention.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="annotation class ExperimentalKotlinAnnotationWrongRetention"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/ExperimentalKotlinAnnotationWrongRetention.kt"
-            line="21"
-            column="18"/>
+            file="src/main/java/sample/optin/ExperimentalKotlinAnnotationWrongRetention.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    static class ConcreteExperimentalInterface implements ExperimentalInterface { // unsafe"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava192562469.java"
-            line="34"
-            column="59"/>
+            file="src/main/java/sample/optin/RegressionTestJava192562469.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        public void experimentalMethod() {} // unsafe override"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava192562469.java"
-            line="36"
-            column="21"/>
+            file="src/main/java/sample/optin/RegressionTestJava192562469.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        ExperimentalInterface anonymous = new ExperimentalInterface() { // unsafe"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava192562469.java"
-            line="62"
-            column="47"/>
+            file="src/main/java/sample/optin/RegressionTestJava192562469.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            public void experimentalMethod() {} // unsafe override"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava192562469.java"
-            line="64"
-            column="25"/>
+            file="src/main/java/sample/optin/RegressionTestJava192562469.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        ExperimentalInterface lambda = () -> {}; // unsafe"
         errorLine2="                                       ~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava192562469.java"
-            line="67"
-            column="40"/>
+            file="src/main/java/sample/optin/RegressionTestJava192562469.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        public void experimentalMethod() {} // unsafe override"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava192562926.java"
-            line="39"
-            column="21"/>
+            file="src/main/java/sample/optin/RegressionTestJava192562926.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            public void experimentalMethod() {} // unsafe override"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava192562926.java"
-            line="49"
-            column="25"/>
+            file="src/main/java/sample/optin/RegressionTestJava192562926.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        StableInterface lambda = () -> {}; // unsafe override"
         errorLine2="                                 ~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava192562926.java"
-            line="52"
-            column="34"/>
+            file="src/main/java/sample/optin/RegressionTestJava192562926.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        foo.defaultExperimentalMethod(); // unsafe in Java but safe in Kotlin"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava193110413.java"
-            line="92"
-            column="13"/>
+            file="src/main/java/sample/optin/RegressionTestJava193110413.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        foo.experimentalMethod(); // unsafe"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava193110413.java"
-            line="93"
-            column="13"/>
+            file="src/main/java/sample/optin/RegressionTestJava193110413.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        Bar bar = new Bar(); // unsafe"
         errorLine2="                  ~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava193110413.java"
-            line="95"
-            column="19"/>
+            file="src/main/java/sample/optin/RegressionTestJava193110413.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        bar.stableMethodLevelOptIn(); // unsafe due to experimental class scope"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava193110413.java"
-            line="96"
-            column="13"/>
+            file="src/main/java/sample/optin/RegressionTestJava193110413.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="        bar.experimentalMethod(); // unsafe"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/RegressionTestJava193110413.java"
-            line="97"
-            column="13"/>
+            file="src/main/java/sample/optin/RegressionTestJava193110413.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="        AnnotatedJavaClass experimentalObject = new AnnotatedJavaClass();"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"
-            line="31"
-            column="49"/>
+            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        return experimentalObject.field;"
         errorLine2="                                  ~~~~~">
         <location
-            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"
-            line="32"
-            column="35"/>
+            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        AnnotatedJavaClass experimentalObject = new AnnotatedJavaClass();"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"
-            line="39"
-            column="49"/>
+            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        return experimentalObject.method();"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"
-            line="40"
-            column="35"/>
+            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        return AnnotatedJavaClass.FIELD_STATIC;"
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"
-            line="47"
-            column="35"/>
+            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="        return AnnotatedJavaClass.methodStatic();"
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"
-            line="54"
-            column="35"/>
+            file="src/main/java/sample/optin/UseJavaExperimentalClassFromJava.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="        DateProvider dateProvider = new DateProvider();"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/experimental/UseJavaExperimentalFromJava.java"
-            line="25"
-            column="37"/>
+            file="src/main/java/sample/experimental/UseJavaExperimentalFromJava.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="        return dateProvider.getDate();"
         errorLine2="                            ~~~~~~~">
         <location
-            file="src/main/java/sample/experimental/UseJavaExperimentalFromJava.java"
-            line="26"
-            column="29"/>
+            file="src/main/java/sample/experimental/UseJavaExperimentalFromJava.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="        LocationProvider locationProvider = new LocationProvider();"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/experimental/UseJavaExperimentalFromJava.java"
-            line="53"
-            column="45"/>
+            file="src/main/java/sample/experimental/UseJavaExperimentalFromJava.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="        return dateProvider.getDate() + locationProvider.getLocation();"
         errorLine2="                                                         ~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/experimental/UseJavaExperimentalFromJava.java"
-            line="54"
-            column="58"/>
+            file="src/main/java/sample/experimental/UseJavaExperimentalFromJava.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="        val experimentalObject = AnnotatedJavaClass()"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/sample/optin/UseJavaExperimentalFromKt.kt"
-            line="28"
-            column="34"/>
+            file="src/main/java/sample/optin/UseJavaExperimentalFromKt.kt"/>
     </issue>
 
     <issue
diff --git a/appcompat/appcompat-resources/lint-baseline.xml b/appcompat/appcompat-resources/lint-baseline.xml
index b002b8a..a35bd9e 100644
--- a/appcompat/appcompat-resources/lint-baseline.xml
+++ b/appcompat/appcompat-resources/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        assertNotNull(ld.getDrawable(0).getColorFilter());"
         errorLine2="                                        ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java"
-            line="79"
-            column="41"/>
+            file="src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    /**"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="93"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public synchronized void setHooks(ResourceManagerHooks hooks) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="131"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public synchronized Drawable getDrawable(@NonNull Context context, @DrawableRes int resId) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="135"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    synchronized Drawable getDrawable(@NonNull Context context, @DrawableRes int resId,"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="139"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public synchronized void onConfigurationChanged(@NonNull Context context) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="162"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    private synchronized Drawable getCachedDrawable(@NonNull final Context context,"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="317"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    private synchronized boolean addDrawableToCache(@NonNull final Context context, final long key,"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="338"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    synchronized Drawable onDrawableLoadedFromResources(@NonNull Context context,"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="353"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    synchronized ColorStateList getTintList(@NonNull Context context, @DrawableRes int resId) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="381"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public static synchronized PorterDuffColorFilter getPorterDuffColorFilter("
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"
-            line="471"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java"/>
     </issue>
 
     <issue
@@ -128,13 +106,9 @@
         errorLine1="    public Resources.Theme getTheme() {"
         errorLine2="                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/widget/TintContextWrapper.java"
-            line="107"
-            column="28"/>
+            file="src/main/java/androidx/appcompat/widget/TintContextWrapper.java"/>
         <location
             file="src/main/java/androidx/appcompat/widget/TintContextWrapper.java"
-            line="112"
-            column="17"
             message="Setter here"/>
     </issue>
 
@@ -144,9 +118,7 @@
         errorLine1="    public void scheduleDrawable(Drawable who, Runnable what, long when) {"
         errorLine2="                                                              ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableWrapper.java"
-            line="169"
-            column="63"/>
+            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableWrapper.java"/>
     </issue>
 
     <issue
@@ -155,9 +127,7 @@
         errorLine1="    public static AnimatedStateListDrawableCompat createFromXmlInner("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java"
-            line="165"
-            column="19"/>
+            file="src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -166,9 +136,7 @@
         errorLine1="    protected boolean onStateChange(int[] stateSet) {"
         errorLine2="                                    ~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java"
-            line="276"
-            column="37"/>
+            file="src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -177,9 +145,7 @@
         errorLine1="    public Drawable mutate() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java"
-            line="605"
-            column="12"/>
+            file="src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -188,9 +154,7 @@
         errorLine1="    public static ColorStateList getColorStateList(@NonNull Context context, @ColorRes int resId) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/content/res/AppCompatResources.java"
-            line="47"
-            column="19"/>
+            file="src/main/java/androidx/appcompat/content/res/AppCompatResources.java"/>
     </issue>
 
     <issue
@@ -199,9 +163,7 @@
         errorLine1="    public static PorterDuff.Mode parseTintMode(int value, PorterDuff.Mode defaultMode) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/widget/DrawableUtils.java"
-            line="159"
-            column="19"/>
+            file="src/main/java/androidx/appcompat/widget/DrawableUtils.java"/>
     </issue>
 
     <issue
@@ -210,9 +172,7 @@
         errorLine1="    public static PorterDuff.Mode parseTintMode(int value, PorterDuff.Mode defaultMode) {"
         errorLine2="                                                           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/widget/DrawableUtils.java"
-            line="159"
-            column="60"/>
+            file="src/main/java/androidx/appcompat/widget/DrawableUtils.java"/>
     </issue>
 
     <issue
@@ -221,9 +181,7 @@
         errorLine1="    public DrawableWrapper(Drawable drawable) {"
         errorLine2="                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableWrapper.java"
-            line="46"
-            column="28"/>
+            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableWrapper.java"/>
     </issue>
 
     <issue
@@ -232,9 +190,7 @@
         errorLine1="    public void draw(Canvas canvas) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableWrapper.java"
-            line="51"
-            column="22"/>
+            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableWrapper.java"/>
     </issue>
 
     <issue
@@ -243,9 +199,7 @@
         errorLine1="    protected void onBoundsChange(Rect bounds) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableWrapper.java"
-            line="56"
-            column="35"/>
+            file="src/main/java/androidx/appcompat/graphics/drawable/DrawableWrapper.java"/>
     </issue>
 
     <issue
diff --git a/appcompat/appcompat/lint-baseline.xml b/appcompat/appcompat/lint-baseline.xml
index 935518b..991b490 100644
--- a/appcompat/appcompat/lint-baseline.xml
+++ b/appcompat/appcompat/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                || button instanceof AnimatedStateListDrawable);"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/AppCompatCheckBoxTest.java"
-            line="71"
-            column="38"/>
+            file="src/androidTest/java/androidx/appcompat/widget/AppCompatCheckBoxTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                || checkMark instanceof AnimatedStateListDrawable);"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/AppCompatCheckedTextViewTest.java"
-            line="89"
-            column="41"/>
+            file="src/androidTest/java/androidx/appcompat/widget/AppCompatCheckedTextViewTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        final InputContentInfo contentInfo = new InputContentInfo("
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextReceiveContentTest.java"
-            line="541"
-            column="46"/>
+            file="src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextReceiveContentTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        return ic.commitContent(contentInfo, flags, null);"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextReceiveContentTest.java"
-            line="549"
-            column="19"/>
+            file="src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextReceiveContentTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    private static class NoOpTextClassifier implements TextClassifier {}"
         errorLine2="                                                       ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java"
-            line="201"
-            column="56"/>
+            file="src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                || button instanceof AnimatedStateListDrawable);"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java"
-            line="72"
-            column="38"/>
+            file="src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        wrappedBase.applyOverrideConfiguration(overrideConfig);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlActivity.java"
-            line="33"
-            column="21"/>
+            file="src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlActivity.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    private static class NoOpTextClassifier implements TextClassifier {}"
         errorLine2="                                                       ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewTest.java"
-            line="928"
-            column="56"/>
+            file="src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            wrappedBase.applyOverrideConfiguration(overrideConfig);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/testutils/BaseTestActivity.java"
-            line="97"
-            column="25"/>
+            file="src/androidTest/java/androidx/appcompat/testutils/BaseTestActivity.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        mSystemWindowInsetTop = insets.getSystemWindowInsetTop();"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/custom/CustomDrawerLayout.java"
-            line="41"
-            column="40"/>
+            file="src/androidTest/java/androidx/appcompat/custom/CustomDrawerLayout.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        configuration.setLayoutDirection(locale)"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt"
-            line="73"
-            column="23"/>
+            file="src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        configuration.setLocale(locale)"
         errorLine2="                      ~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt"
-            line="74"
-            column="23"/>
+            file="src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        assertEquals(TextUtils.getLayoutDirectionFromLocale(CUSTOM_LOCALE), config.layoutDirection)"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt"
-            line="94"
-            column="32"/>
+            file="src/androidTest/java/androidx/appcompat/app/NightModeRtlTestUtilsRegressionTestCase.kt"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public static synchronized void preload() {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="58"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    /**"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="462"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         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"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         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"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public synchronized void onConfigurationChanged(@NonNull Context context) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="483"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    synchronized Drawable onDrawableLoadedFromResources(@NonNull Context context,"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="487"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         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"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public static synchronized PorterDuffColorFilter getPorterDuffColorFilter("
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"
-            line="505"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatDrawableManager.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatRatingBar.java"
-            line="59"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatRatingBar.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatSeekBar.java"
-            line="58"
-            column="5"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatSeekBar.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="                info.setHomeAsUpIndicator.invoke(actionBar, drawable);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"
-            line="55"
-            column="17"/>
+            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="                info.setHomeActionContentDescription.invoke(actionBar, contentDescRes);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"
-            line="56"
-            column="17"/>
+            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="                info.setHomeActionContentDescription.invoke(actionBar, contentDescRes);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"
-            line="76"
-            column="17"/>
+            file="src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="                        method.invoke(mTextView);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.java"
-            line="677"
-            column="25"/>
+            file="src/main/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.java"/>
     </issue>
 
     <issue
diff --git a/appsearch/appsearch-platform-storage/lint-baseline.xml b/appsearch/appsearch-platform-storage/lint-baseline.xml
index b9f27c8..d977a53 100644
--- a/appsearch/appsearch-platform-storage/lint-baseline.xml
+++ b/appsearch/appsearch-platform-storage/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                new PlatformStorage.SearchContext.Builder("
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="34"
-            column="17"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                        /*databaseName=*/&quot;dbName&quot;).build();"
         errorLine2="                                                   ~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="36"
-            column="52"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        assertThat(searchContext.getDatabaseName()).isEqualTo(&quot;dbName&quot;);"
         errorLine2="                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="38"
-            column="34"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        PlatformStorage.SearchContext searchContext = new PlatformStorage.SearchContext.Builder("
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="44"
-            column="55"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                .setWorkerExecutor(executor)"
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="47"
-            column="18"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                .build();"
         errorLine2="                 ~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="48"
-            column="18"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        assertThat(searchContext.getWorkerExecutor()).isEqualTo(executor);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="50"
-            column="34"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        assertThat(searchContext.getDatabaseName()).isEqualTo(&quot;dbName&quot;);"
         errorLine2="                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="51"
-            column="34"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        PlatformStorage.SearchContext searchContext = new PlatformStorage.SearchContext.Builder("
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="56"
-            column="55"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                .build();"
         errorLine2="                 ~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="59"
-            column="18"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        assertThat(searchContext.getWorkerExecutor()).isNotNull();"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="61"
-            column="34"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        assertThat(searchContext.getDatabaseName()).isEqualTo(&quot;dbName&quot;);"
         errorLine2="                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="62"
-            column="34"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                () -> new PlatformStorage.SearchContext.Builder("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="71"
-            column="23"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                        &quot;testDatabaseNameEndWith/&quot;).build());"
         errorLine2="                                                    ~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="73"
-            column="53"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                () -> new PlatformStorage.SearchContext.Builder("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="76"
-            column="23"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                        &quot;/testDatabaseNameStartWith&quot;).build());"
         errorLine2="                                                      ~~~~~">
         <location
-            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"
-            line="78"
-            column="55"/>
+            file="src/androidTest/java/androidx/appsearch/platformstorage/PlatformStorageTest.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                platformResult.getResultCode(), platformResult.getErrorMessage());"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/AppSearchResultToPlatformConverter.java"
-            line="55"
-            column="17"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/AppSearchResultToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                            platformResult.getResultCode(), platformResult.getErrorMessage()));"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/AppSearchResultToPlatformConverter.java"
-            line="72"
-            column="29"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/AppSearchResultToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                    failure.getValue().getResultCode(),"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/AppSearchResultToPlatformConverter.java"
-            line="99"
-            column="21"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/AppSearchResultToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="                                        result.getResultCode(), result.getErrorMessage()));"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/PlatformStorage.java"
-            line="229"
-            column="41"/>
+            file="src/main/java/androidx/appsearch/platformstorage/PlatformStorage.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="                                        result.getResultCode(), result.getErrorMessage()));"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/PlatformStorage.java"
-            line="255"
-            column="41"/>
+            file="src/main/java/androidx/appsearch/platformstorage/PlatformStorage.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="                    .setCardinality(stringProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="86"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="                    .setIndexingType(stringProperty.getIndexingType())"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="87"
-            column="38"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="                    .setTokenizerType(stringProperty.getTokenizerType())"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="88"
-            column="39"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="                    .setCardinality(jetpackProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="93"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="                    .setCardinality(jetpackProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="98"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="                    .setCardinality(jetpackProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="103"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="                    .setCardinality(jetpackProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="108"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="                    .setCardinality(documentProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="115"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="                    .setCardinality(stringProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="133"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="                    .setIndexingType(stringProperty.getIndexingType())"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="134"
-            column="38"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="                    .setTokenizerType(stringProperty.getTokenizerType())"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="135"
-            column="39"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="                    .setCardinality(platformProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="140"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="                    .setCardinality(platformProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="145"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="                    .setCardinality(platformProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="150"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="                    .setCardinality(platformProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="155"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="                    .setCardinality(documentProperty.getCardinality())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"
-            line="164"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SchemaToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="                        new AppSearchException(result.getResultCode(), result.getErrorMessage()));"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/SearchResultsImpl.java"
-            line="90"
-            column="48"/>
+            file="src/main/java/androidx/appsearch/platformstorage/SearchResultsImpl.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="                        platformResult.getResultCode(), platformResult.getErrorMessage()));"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/SearchSessionImpl.java"
-            line="307"
-            column="25"/>
+            file="src/main/java/androidx/appsearch/platformstorage/SearchSessionImpl.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="                .setTermMatch(jetpackSearchSpec.getTermMatch())"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"
-            line="49"
-            column="31"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="                .setRankingStrategy(jetpackSearchSpec.getRankingStrategy())"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"
-            line="54"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="                .setOrder(jetpackSearchSpec.getOrder())"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"
-            line="55"
-            column="27"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="                    jetpackSearchSpec.getResultGroupingTypeFlags(),"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"
-            line="61"
-            column="21"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchSpecToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="                    platformResponse.getSchemaTypesNotDisplayedBySystem()) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"
-            line="64"
-            column="38"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="                    platformResponse.getRequiredPermissionsForSchemaTypeVisibility().entrySet()) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"
-            line="71"
-            column="38"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="                platformResponse.getSchemaTypesVisibleToPackages();"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"
-            line="91"
-            column="34"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/GetSchemaResponseToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="            mPlatformSession.getByDocumentId(packageName, databaseName,"
         errorLine2="                             ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"
-            line="95"
-            column="30"/>
+            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="            mPlatformSession.getSchema("
         errorLine2="                             ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"
-            line="144"
-            column="30"/>
+            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="                    mPlatformSession.registerObserverCallback("
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"
-            line="210"
-            column="38"/>
+            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="                    mPlatformSession.unregisterObserverCallback(targetPackageName,"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"
-            line="249"
-            column="38"/>
+            file="src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="                            platformMatchInfo.getSubmatchRange().getStart(),"
         errorLine2="                                              ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java"
-            line="76"
-            column="47"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="                            platformMatchInfo.getSubmatchRange().getEnd()));"
         errorLine2="                                              ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java"
-            line="77"
-            column="47"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SearchResultToPlatformConverter.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="                    platformBuilder.addRequiredPermissionsForSchemaTypeVisibility("
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/appsearch/platformstorage/converter/SetSchemaRequestToPlatformConverter.java"
-            line="83"
-            column="37"/>
+            file="src/main/java/androidx/appsearch/platformstorage/converter/SetSchemaRequestToPlatformConverter.java"/>
     </issue>
 
 </issues>
diff --git a/arch/core/core-common/lint-baseline.xml b/arch/core/core-common/lint-baseline.xml
index 259015f..44db876 100644
--- a/arch/core/core-common/lint-baseline.xml
+++ b/arch/core/core-common/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    protected Entry&lt;K, V> get(K k) {"
         errorLine2="              ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/internal/FastSafeIterableMap.java"
-            line="41"
-            column="15"/>
+            file="src/main/java/androidx/arch/core/internal/FastSafeIterableMap.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public Map.Entry&lt;K, V> ceil(K k) {"
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/internal/FastSafeIterableMap.java"
-            line="75"
-            column="12"/>
+            file="src/main/java/androidx/arch/core/internal/FastSafeIterableMap.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    protected Entry&lt;K, V> get(K k) {"
         errorLine2="              ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"
-            line="46"
-            column="15"/>
+            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public Iterator&lt;Map.Entry&lt;K, V>> descendingIterator() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"
-            line="150"
-            column="12"/>
+            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public IteratorWithAdditions iteratorWithAdditions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"
-            line="159"
-            column="12"/>
+            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public Map.Entry&lt;K, V> eldest() {"
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"
-            line="169"
-            column="12"/>
+            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public Map.Entry&lt;K, V> newest() {"
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"
-            line="176"
-            column="12"/>
+            file="src/main/java/androidx/arch/core/internal/SafeIterableMap.java"/>
     </issue>
 
 </issues>
diff --git a/arch/core/core-runtime/lint-baseline.xml b/arch/core/core-runtime/lint-baseline.xml
index d04c4a5..e6ab10a 100644
--- a/arch/core/core-runtime/lint-baseline.xml
+++ b/arch/core/core-runtime/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void executeOnDiskIO(Runnable runnable) {"
         errorLine2="                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/ArchTaskExecutor.java"
-            line="95"
-            column="33"/>
+            file="src/main/java/androidx/arch/core/executor/ArchTaskExecutor.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void postToMainThread(Runnable runnable) {"
         errorLine2="                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/ArchTaskExecutor.java"
-            line="100"
-            column="34"/>
+            file="src/main/java/androidx/arch/core/executor/ArchTaskExecutor.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public void executeOnDiskIO(Runnable runnable) {"
         errorLine2="                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java"
-            line="59"
-            column="33"/>
+            file="src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public void postToMainThread(Runnable runnable) {"
         errorLine2="                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java"
-            line="64"
-            column="34"/>
+            file="src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java"/>
     </issue>
 
 </issues>
diff --git a/arch/core/core-testing/lint-baseline.xml b/arch/core/core-testing/lint-baseline.xml
index 6ffef90..893996b 100644
--- a/arch/core/core-testing/lint-baseline.xml
+++ b/arch/core/core-testing/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    protected void starting(Description description) {"
         errorLine2="                            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java"
-            line="41"
-            column="29"/>
+            file="src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    protected void finished(Description description) {"
         errorLine2="                            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java"
-            line="57"
-            column="29"/>
+            file="src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public void drainTasks(int time, TimeUnit timeUnit)"
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java"
-            line="111"
-            column="38"/>
+            file="src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    protected void starting(Description description) {"
         errorLine2="                            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/testing/InstantTaskExecutorRule.java"
-            line="33"
-            column="29"/>
+            file="src/main/java/androidx/arch/core/executor/testing/InstantTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    protected void finished(Description description) {"
         errorLine2="                            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/testing/InstantTaskExecutorRule.java"
-            line="54"
-            column="29"/>
+            file="src/main/java/androidx/arch/core/executor/testing/InstantTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public TaskExecutor getTaskExecutor() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java"
-            line="58"
-            column="12"/>
+            file="src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public Statement apply(final Statement base, Description description) {"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java"
-            line="72"
-            column="12"/>
+            file="src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public Statement apply(final Statement base, Description description) {"
         errorLine2="                                 ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java"
-            line="72"
-            column="34"/>
+            file="src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public Statement apply(final Statement base, Description description) {"
         errorLine2="                                                 ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java"
-            line="72"
-            column="50"/>
+            file="src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public void executeOnDiskIO(Runnable runnable) {"
         errorLine2="                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/TaskExecutorWithFakeMainThread.java"
-            line="72"
-            column="33"/>
+            file="src/main/java/androidx/arch/core/executor/TaskExecutorWithFakeMainThread.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void postToMainThread(Runnable runnable) {"
         errorLine2="                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/arch/core/executor/TaskExecutorWithFakeMainThread.java"
-            line="77"
-            column="34"/>
+            file="src/main/java/androidx/arch/core/executor/TaskExecutorWithFakeMainThread.java"/>
     </issue>
 
 </issues>
diff --git a/benchmark/benchmark-common/lint-baseline.xml b/benchmark/benchmark-common/lint-baseline.xml
index 4d75c69..bbb6ad1 100644
--- a/benchmark/benchmark-common/lint-baseline.xml
+++ b/benchmark/benchmark-common/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                BACKGROUND_SPINNING_PROCESS_NAME"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/benchmark/ShellTest.kt"
-            line="48"
-            column="17"/>
+            file="src/androidTest/java/androidx/benchmark/ShellTest.kt"/>
     </issue>
 
 </issues>
diff --git a/biometric/biometric/lint-baseline.xml b/biometric/biometric/lint-baseline.xml
index 75d3bdd..c01692f 100644
--- a/biometric/biometric/lint-baseline.xml
+++ b/biometric/biometric/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                return mock(android.os.CancellationSignal.class);"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/biometric/CancellationSignalProviderTest.java"
-            line="70"
-            column="29"/>
+            file="src/test/java/androidx/biometric/CancellationSignalProviderTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                provider.getBiometricCancellationSignal();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/biometric/CancellationSignalProviderTest.java"
-            line="148"
-            column="26"/>
+            file="src/test/java/androidx/biometric/CancellationSignalProviderTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        doThrow(NullPointerException.class).when(biometricSignal).cancel();"
         errorLine2="                                                                  ~~~~~~">
         <location
-            file="src/test/java/androidx/biometric/CancellationSignalProviderTest.java"
-            line="152"
-            column="67"/>
+            file="src/test/java/androidx/biometric/CancellationSignalProviderTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        assertThat(provider.getBiometricCancellationSignal()).isNotEqualTo(biometricSignal);"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/biometric/CancellationSignalProviderTest.java"
-            line="157"
-            column="29"/>
+            file="src/test/java/androidx/biometric/CancellationSignalProviderTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            return result.getAuthenticationType();"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/biometric/AuthenticationCallbackProvider.java"
-            line="189"
-            column="20"/>
+            file="src/main/java/androidx/biometric/AuthenticationCallbackProvider.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            return biometricManager.canAuthenticate(authenticators);"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/biometric/BiometricManager.java"
-            line="1026"
-            column="20"/>
+            file="src/main/java/androidx/biometric/BiometricManager.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            return biometricManager.canAuthenticate();"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/biometric/BiometricManager.java"
-            line="1062"
-            column="20"/>
+            file="src/main/java/androidx/biometric/BiometricManager.java"/>
     </issue>
 
 </issues>
diff --git a/camera/camera-camera2/lint-baseline.xml b/camera/camera-camera2/lint-baseline.xml
index 71b4b73..3444508 100644
--- a/camera/camera-camera2/lint-baseline.xml
+++ b/camera/camera-camera2/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                CaptureRequest.CONTROL_ZOOM_RATIO, null);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/camera/camera2/internal/ZoomControlDeviceTest.java"
-            line="271"
-            column="17"/>
+            file="src/androidTest/java/androidx/camera/camera2/internal/ZoomControlDeviceTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                return (Size) getSurfaceSize.invoke(null, surface);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"
-            line="237"
-            column="31"/>
+            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                return (int) detectSurfaceType.invoke(null, surface);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"
-            line="257"
-            column="30"/>
+            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                return (int) getGenerationId.invoke(surface);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"
-            line="273"
-            column="30"/>
+            file="src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatBaseImpl.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            configBuilder.setCaptureRequestOption(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE,"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/compat/workaround/AeFpsRange.java"
-            line="56"
-            column="27"/>
+            file="src/main/java/androidx/camera/camera2/internal/compat/workaround/AeFpsRange.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            configBuilder.setCaptureRequestOption(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE,"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/compat/workaround/AeFpsRange.java"
-            line="56"
-            column="51"/>
+            file="src/main/java/androidx/camera/camera2/internal/compat/workaround/AeFpsRange.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                    mAeTargetFpsRange);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/compat/workaround/AeFpsRange.java"
-            line="57"
-            column="21"/>
+            file="src/main/java/androidx/camera/camera2/internal/compat/workaround/AeFpsRange.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        builder.setCaptureRequestOption(CaptureRequest.CONTROL_ZOOM_RATIO, mCurrentZoomRatio);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/AndroidRZoomImpl.java"
-            line="60"
-            column="17"/>
+            file="src/main/java/androidx/camera/camera2/internal/AndroidRZoomImpl.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        builder.setCaptureRequestOption(CaptureRequest.CONTROL_ZOOM_RATIO, mCurrentZoomRatio);"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/AndroidRZoomImpl.java"
-            line="60"
-            column="41"/>
+            file="src/main/java/androidx/camera/camera2/internal/AndroidRZoomImpl.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        builder.setCaptureRequestOption(CaptureRequest.CONTROL_ZOOM_RATIO, mCurrentZoomRatio);"
         errorLine2="                                                                           ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/AndroidRZoomImpl.java"
-            line="60"
-            column="76"/>
+            file="src/main/java/androidx/camera/camera2/internal/AndroidRZoomImpl.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            builder.setCaptureRequestOption(CaptureRequest.SCALER_CROP_REGION,"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/CropRegionZoomImpl.java"
-            line="67"
-            column="21"/>
+            file="src/main/java/androidx/camera/camera2/internal/CropRegionZoomImpl.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="            builder.setCaptureRequestOption(CaptureRequest.SCALER_CROP_REGION,"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/CropRegionZoomImpl.java"
-            line="67"
-            column="45"/>
+            file="src/main/java/androidx/camera/camera2/internal/CropRegionZoomImpl.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                    mCurrentCropRect);"
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/CropRegionZoomImpl.java"
-            line="68"
-            column="21"/>
+            file="src/main/java/androidx/camera/camera2/internal/CropRegionZoomImpl.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        configBuilder.setCaptureRequestOption(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION,"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/ExposureControl.java"
-            line="129"
-            column="23"/>
+            file="src/main/java/androidx/camera/camera2/internal/ExposureControl.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="        configBuilder.setCaptureRequestOption(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION,"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/ExposureControl.java"
-            line="129"
-            column="47"/>
+            file="src/main/java/androidx/camera/camera2/internal/ExposureControl.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                mExposureStateImpl.getExposureCompensationIndex());"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/ExposureControl.java"
-            line="130"
-            column="17"/>
+            file="src/main/java/androidx/camera/camera2/internal/ExposureControl.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        configBuilder.setCaptureRequestOption("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"
-            line="188"
-            column="23"/>
+            file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                CaptureRequest.CONTROL_AF_MODE, mCameraControl.getSupportedAfMode(afMode));"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"
-            line="189"
-            column="17"/>
+            file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                CaptureRequest.CONTROL_AF_MODE, mCameraControl.getSupportedAfMode(afMode));"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"
-            line="189"
-            column="49"/>
+            file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="            configBuilder.setCaptureRequestOption("
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"
-            line="192"
-            column="27"/>
+            file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"/>
     </issue>
 
     <issue
@@ -228,7 +188,6 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/internal/FocusMeteringControl.java"
-            line="193"
             column="21"/>
     </issue>
 
diff --git a/camera/camera-core/lint-baseline.xml b/camera/camera-core/lint-baseline.xml
index aaff45e..e4a0344 100644
--- a/camera/camera-core/lint-baseline.xml
+++ b/camera/camera-core/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="68"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="73"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="79"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="84"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="89"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="94"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="99"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        @Override"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="114"
-            column="9"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        @Override"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="119"
-            column="9"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        @Override"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="124"
-            column="9"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"
-            line="137"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/AndroidImageProxy.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
-            line="65"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"
-            line="71"
-            column="5"/>
+            file="src/main/java/androidx/camera/core/ForwardingImageProxy.java"/>
     </issue>
 
     <issue
diff --git a/camera/camera-extensions-stub/lint-baseline.xml b/camera/camera-extensions-stub/lint-baseline.xml
index 72190a0..cd2b316 100644
--- a/camera/camera-extensions-stub/lint-baseline.xml
+++ b/camera/camera-extensions-stub/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="46"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="46"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="56"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="66"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="66"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="67"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="77"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="82"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="87"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="92"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="47"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="47"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="52"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="57"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="62"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="67"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="67"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="68"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="78"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="83"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="88"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="93"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="46"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="46"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="56"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="66"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="66"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="67"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="77"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="82"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="87"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="92"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="47"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="47"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="52"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="57"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="62"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="67"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="67"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="68"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="78"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="83"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="88"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="93"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="46"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="46"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="56"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="66"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="66"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="67"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="77"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="82"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="87"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="92"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="45"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="45"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="50"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="55"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="60"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="65"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="65"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="66"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="76"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="81"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -744,9 +610,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="86"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -755,9 +619,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="91"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -766,9 +628,7 @@
         errorLine1="    void process(Map&lt;Integer, Pair&lt;Image, TotalCaptureResult>> results);"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"
-            line="43"
-            column="18"/>
+            file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -777,9 +637,7 @@
         errorLine1="    List&lt;Pair&lt;CaptureRequest.Key, Object>> getParameters();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java"
-            line="37"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java"/>
     </issue>
 
     <issue
@@ -788,9 +646,7 @@
         errorLine1="    void onInit(String cameraId, CameraCharacteristics cameraCharacteristics, Context context);"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="42"
-            column="17"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -799,9 +655,7 @@
         errorLine1="    void onInit(String cameraId, CameraCharacteristics cameraCharacteristics, Context context);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="42"
-            column="34"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -810,9 +664,7 @@
         errorLine1="    void onInit(String cameraId, CameraCharacteristics cameraCharacteristics, Context context);"
         errorLine2="                                                                              ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="42"
-            column="79"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -821,9 +673,7 @@
         errorLine1="    CaptureStageImpl onPresetSession();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="61"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -832,9 +682,7 @@
         errorLine1="    CaptureStageImpl onEnableSession();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="72"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -843,9 +691,7 @@
         errorLine1="    CaptureStageImpl onDisableSession();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="82"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -854,9 +700,7 @@
         errorLine1="    public String checkApiVersion(String version) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"
-            line="53"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"/>
     </issue>
 
     <issue
@@ -865,9 +709,7 @@
         errorLine1="    public String checkApiVersion(String version) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"
-            line="53"
-            column="35"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"/>
     </issue>
 
     <issue
@@ -876,9 +718,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="46"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -887,9 +727,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="46"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -898,9 +736,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -909,9 +745,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="56"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -920,9 +754,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="66"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -931,9 +763,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="66"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -942,9 +772,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="67"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -953,9 +781,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="77"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -964,9 +790,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="82"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -975,9 +799,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="87"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -986,9 +808,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="92"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -997,9 +817,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="47"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1008,9 +826,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="47"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1019,9 +835,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="52"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1030,9 +844,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="57"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1041,9 +853,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="62"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1052,9 +862,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="67"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1063,9 +871,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="67"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1074,9 +880,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="68"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1085,9 +889,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="78"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1096,9 +898,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="83"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1107,9 +907,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="88"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1118,9 +916,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="93"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1129,9 +925,7 @@
         errorLine1="    boolean isExtensionAvailable(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="42"
-            column="34"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1140,9 +934,7 @@
         errorLine1="    boolean isExtensionAvailable(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="42"
-            column="51"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1151,9 +943,7 @@
         errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="53"
-            column="15"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1162,9 +952,7 @@
         errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="53"
-            column="32"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1173,9 +961,7 @@
         errorLine1="    CaptureProcessorImpl getCaptureProcessor();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="58"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1184,9 +970,7 @@
         errorLine1="    List&lt;CaptureStageImpl> getCaptureStages();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="61"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1195,9 +979,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="46"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1206,9 +988,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="46"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1217,9 +997,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1228,9 +1006,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="56"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1239,9 +1015,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="66"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1250,9 +1024,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="66"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1261,9 +1033,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="67"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1272,9 +1042,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="77"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1283,9 +1051,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="82"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1294,9 +1060,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="87"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1305,9 +1069,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="92"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1316,9 +1078,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="47"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1327,9 +1087,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="47"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1338,9 +1096,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="52"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1349,9 +1105,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="57"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1360,9 +1114,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="62"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1371,9 +1123,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="67"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1382,9 +1132,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="67"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1393,9 +1141,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="68"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1404,9 +1150,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="78"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1415,9 +1159,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="83"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1426,9 +1168,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="88"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1437,9 +1177,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="93"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1448,9 +1186,7 @@
         errorLine1="    boolean isExtensionAvailable(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="52"
-            column="34"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1459,9 +1195,7 @@
         errorLine1="    boolean isExtensionAvailable(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="52"
-            column="51"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1470,9 +1204,7 @@
         errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="63"
-            column="15"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1481,9 +1213,7 @@
         errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="63"
-            column="32"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1492,9 +1222,7 @@
         errorLine1="    CaptureStageImpl getCaptureStage();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="76"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1503,9 +1231,7 @@
         errorLine1="    ProcessorType getProcessorType();"
         errorLine2="    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="79"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1514,9 +1240,7 @@
         errorLine1="    ProcessorImpl getProcessor();"
         errorLine2="    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="94"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1525,9 +1249,7 @@
         errorLine1="    void process(Image image, TotalCaptureResult result);"
         errorLine2="                 ~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"
-            line="40"
-            column="18"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1536,9 +1258,7 @@
         errorLine1="    void process(Image image, TotalCaptureResult result);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"
-            line="40"
-            column="31"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1547,9 +1267,7 @@
         errorLine1="    void onOutputSurface(Surface surface, int imageFormat);"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"
-            line="34"
-            column="26"/>
+            file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1558,9 +1276,7 @@
         errorLine1="    void onResolutionUpdate(Size size);"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"
-            line="44"
-            column="29"/>
+            file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1569,9 +1285,7 @@
         errorLine1="    CaptureStageImpl process(TotalCaptureResult result);"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"
-            line="35"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1580,9 +1294,7 @@
         errorLine1="    CaptureStageImpl process(TotalCaptureResult result);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"
-            line="35"
-            column="30"/>
+            file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"/>
     </issue>
 
 </issues>
diff --git a/camera/camera-extensions/lint-baseline.xml b/camera/camera-extensions/lint-baseline.xml
index 56e2f24..68643d2 100644
--- a/camera/camera-extensions/lint-baseline.xml
+++ b/camera/camera-extensions/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        Camera2ImplConfig.Builder camera2ConfigurationBuilder = new Camera2ImplConfig.Builder();"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"
-            line="40"
-            column="65"/>
+            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            camera2ConfigurationBuilder.setCaptureRequestOption(captureParameter.first,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"
-            line="43"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            camera2ConfigurationBuilder.setCaptureRequestOption(captureParameter.first,"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"
-            line="43"
-            column="65"/>
+            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    captureParameter.second);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"
-            line="44"
-            column="21"/>
+            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        captureConfigBuilder.addImplementationOptions(camera2ConfigurationBuilder.build());"
         errorLine2="                                                                                  ~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"
-            line="48"
-            column="83"/>
+            file="src/main/java/androidx/camera/extensions/internal/AdaptingCaptureStage.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                CaptureRequestOptions.Builder.from(parameters).build();"
         errorLine2="                                              ~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"
-            line="120"
-            column="47"/>
+            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                CaptureRequestOptions.Builder.from(parameters).build();"
         errorLine2="                                                   ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"
-            line="120"
-            column="52"/>
+            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                CaptureRequestOptions.Builder.from(parameters).build();"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"
-            line="120"
-            column="64"/>
+            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            Camera2ImplConfig.Builder camera2ConfigBuilder = new Camera2ImplConfig.Builder();"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"
-            line="263"
-            column="62"/>
+            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                camera2ConfigBuilder.setCaptureRequestOption(objKey,"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"
-            line="267"
-            column="38"/>
+            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="                camera2ConfigBuilder.setCaptureRequestOption(objKey,"
         errorLine2="                                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"
-            line="267"
-            column="62"/>
+            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="                        implRequest.getParameters().get(objKey));"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"
-            line="268"
-            column="25"/>
+            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="            mParameters = camera2ConfigBuilder.build();"
         errorLine2="                                               ~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"
-            line="270"
-            column="48"/>
+            file="src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                new Camera2ImplConfig.Extender&lt;>(builder).setCameraEventCallback("
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java"
-            line="113"
-            column="17"/>
+            file="src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                new Camera2ImplConfig.Extender&lt;>(builder).setCameraEventCallback("
         errorLine2="                                                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java"
-            line="113"
-            column="50"/>
+            file="src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                new Camera2ImplConfig.Extender&lt;>(builder).setCameraEventCallback("
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java"
-            line="113"
-            column="59"/>
+            file="src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                        new CameraEventCallbacks(imageCaptureEventAdapter));"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java"
-            line="114"
-            column="25"/>
+            file="src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                new Camera2ImplConfig.Extender&lt;>(builder).setCameraEventCallback("
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/PreviewConfigProvider.java"
-            line="115"
-            column="17"/>
+            file="src/main/java/androidx/camera/extensions/internal/PreviewConfigProvider.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                new Camera2ImplConfig.Extender&lt;>(builder).setCameraEventCallback("
         errorLine2="                                                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/PreviewConfigProvider.java"
-            line="115"
-            column="50"/>
+            file="src/main/java/androidx/camera/extensions/internal/PreviewConfigProvider.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="                new Camera2ImplConfig.Extender&lt;>(builder).setCameraEventCallback("
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/PreviewConfigProvider.java"
-            line="115"
-            column="59"/>
+            file="src/main/java/androidx/camera/extensions/internal/PreviewConfigProvider.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="                        new CameraEventCallbacks(previewEventAdapter));"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/internal/PreviewConfigProvider.java"
-            line="116"
-            column="25"/>
+            file="src/main/java/androidx/camera/extensions/internal/PreviewConfigProvider.java"/>
     </issue>
 
 </issues>
diff --git a/camera/camera-testing/lint-baseline.xml b/camera/camera-testing/lint-baseline.xml
index c69eb07..a556397 100644
--- a/camera/camera-testing/lint-baseline.xml
+++ b/camera/camera-testing/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void setAfMode(CameraCaptureMetaData.AfMode mode) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="44"
-            column="27"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void setAfState(CameraCaptureMetaData.AfState state) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="48"
-            column="28"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public void setAeState(CameraCaptureMetaData.AeState state) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="52"
-            column="28"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public void setAwbState(CameraCaptureMetaData.AwbState state) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="56"
-            column="29"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void setFlashState(CameraCaptureMetaData.FlashState state) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="60"
-            column="31"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public void setTag(TagBundle tag) {"
         errorLine2="                       ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"
-            line="68"
-            column="24"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraCaptureResult.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public void setSuggestedResolution(String cameraId, Class&lt;? extends UseCaseConfig&lt;?>> type,"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="43"
-            column="40"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public void setSuggestedResolution(String cameraId, Class&lt;? extends UseCaseConfig&lt;?>> type,"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="43"
-            column="57"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            Size size) {"
         errorLine2="            ~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="44"
-            column="13"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public boolean checkSupported(String cameraId, List&lt;SurfaceConfig> surfaceConfigList) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="56"
-            column="35"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public boolean checkSupported(String cameraId, List&lt;SurfaceConfig> surfaceConfigList) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="56"
-            column="52"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public SurfaceConfig transformSurfaceConfig(String cameraId, int imageFormat, Size size) {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="61"
-            column="12"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public SurfaceConfig transformSurfaceConfig(String cameraId, int imageFormat, Size size) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="61"
-            column="49"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public SurfaceConfig transformSurfaceConfig(String cameraId, int imageFormat, Size size) {"
         errorLine2="                                                                                  ~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"
-            line="61"
-            column="83"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCameraDeviceSurfaceManager.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public FakeCaptureStage(int id, CaptureConfig captureConfig) {"
         errorLine2="                                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCaptureStage.java"
-            line="38"
-            column="37"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCaptureStage.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public CaptureConfig getCaptureConfig() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeCaptureStage.java"
-            line="49"
-            column="12"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeCaptureStage.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public void setPlanes(PlaneProxy[] planeProxy) {"
         errorLine2="                          ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"
-            line="165"
-            column="27"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeImageProxy.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public void setSurface(Surface surface) {"
         errorLine2="                           ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"
-            line="195"
-            column="28"/>
+            file="src/main/java/androidx/camera/testing/fakes/FakeImageReaderProxy.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public static void waitForLooperToIdle(Handler handler) throws InterruptedException {"
         errorLine2="                                           ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/HandlerUtil.java"
-            line="38"
-            column="44"/>
+            file="src/main/java/androidx/camera/testing/HandlerUtil.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public static MessageQueue getQueue(Looper looper) {"
         errorLine2="                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/compat/LooperCompat.java"
-            line="34"
-            column="19"/>
+            file="src/main/java/androidx/camera/testing/compat/LooperCompat.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public static MessageQueue getQueue(Looper looper) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/testing/compat/LooperCompat.java"
-            line="34"
-            column="41"/>
+            file="src/main/java/androidx/camera/testing/compat/LooperCompat.java"/>
     </issue>
 
 </issues>
diff --git a/camera/camera-testlib-extensions/lint-baseline.xml b/camera/camera-testlib-extensions/lint-baseline.xml
index ede83a7..4b2b78c 100644
--- a/camera/camera-testlib-extensions/lint-baseline.xml
+++ b/camera/camera-testlib-extensions/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="59"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="59"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="78"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="88"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="97"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="97"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="98"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="108"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="124"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="134"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"
-            line="149"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="49"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="49"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="65"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="75"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="80"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="85"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="90"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="90"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="91"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="101"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="117"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"
-            line="127"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/AutoPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="63"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="63"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="83"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="93"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="102"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="102"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="103"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="113"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="129"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="139"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"
-            line="154"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="54"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="54"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="71"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="81"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="86"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="91"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="111"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="111"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="112"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="122"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="138"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"
-            line="148"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BeautyPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="59"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="59"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="78"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="88"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="97"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="97"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="98"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="108"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="124"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="134"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"
-            line="149"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="52"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="52"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="71"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="76"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="119"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="124"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="129"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="129"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="130"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="140"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -744,9 +610,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="156"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -755,9 +619,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"
-            line="166"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/BokehPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -766,9 +628,7 @@
         errorLine1="    void onOutputSurface(Surface surface, int imageFormat);"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"
-            line="44"
-            column="26"/>
+            file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -777,9 +637,7 @@
         errorLine1="    void process(Map&lt;Integer, Pair&lt;Image, TotalCaptureResult>> results);"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"
-            line="56"
-            column="18"/>
+            file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -788,9 +646,7 @@
         errorLine1="    void onResolutionUpdate(Size size);"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"
-            line="65"
-            column="29"/>
+            file="src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -799,9 +655,7 @@
         errorLine1="    List&lt;Pair&lt;CaptureRequest.Key, Object>> getParameters();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java"
-            line="40"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/CaptureStageImpl.java"/>
     </issue>
 
     <issue
@@ -810,9 +664,7 @@
         errorLine1="    void onInit(String cameraId, CameraCharacteristics cameraCharacteristics, Context context);"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="45"
-            column="17"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -821,9 +673,7 @@
         errorLine1="    void onInit(String cameraId, CameraCharacteristics cameraCharacteristics, Context context);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="45"
-            column="34"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -832,9 +682,7 @@
         errorLine1="    void onInit(String cameraId, CameraCharacteristics cameraCharacteristics, Context context);"
         errorLine2="                                                                              ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="45"
-            column="79"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -843,9 +691,7 @@
         errorLine1="    CaptureStageImpl onPresetSession();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="65"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -854,9 +700,7 @@
         errorLine1="    CaptureStageImpl onEnableSession();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="76"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -865,9 +709,7 @@
         errorLine1="    CaptureStageImpl onDisableSession();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"
-            line="86"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtenderStateListener.java"/>
     </issue>
 
     <issue
@@ -876,9 +718,7 @@
         errorLine1="    public String checkApiVersion(String version) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"
-            line="62"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"/>
     </issue>
 
     <issue
@@ -887,9 +727,7 @@
         errorLine1="    public String checkApiVersion(String version) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"
-            line="62"
-            column="35"/>
+            file="src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java"/>
     </issue>
 
     <issue
@@ -898,9 +736,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="66"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -909,9 +745,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="66"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -920,9 +754,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="105"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -931,9 +763,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="132"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -942,9 +772,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="141"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -953,9 +781,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="141"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -964,9 +790,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="142"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -975,9 +799,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="152"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -986,9 +808,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="164"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -997,9 +817,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="170"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1008,9 +826,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"
-            line="181"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1019,9 +835,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="58"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1030,9 +844,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="58"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1041,9 +853,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="69"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1052,9 +862,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="76"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1063,9 +871,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="81"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1074,9 +880,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="86"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1085,9 +889,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="94"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1096,9 +898,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="94"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1107,9 +907,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="95"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1118,9 +916,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="115"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1129,9 +925,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="120"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1140,9 +934,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"
-            line="125"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1151,9 +943,7 @@
         errorLine1="    boolean isExtensionAvailable(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="44"
-            column="34"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1162,9 +952,7 @@
         errorLine1="    boolean isExtensionAvailable(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="44"
-            column="51"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1173,9 +961,7 @@
         errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="55"
-            column="15"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1184,9 +970,7 @@
         errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="55"
-            column="32"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1195,9 +979,7 @@
         errorLine1="    CaptureProcessorImpl getCaptureProcessor();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="60"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1206,9 +988,7 @@
         errorLine1="    List&lt;CaptureStageImpl> getCaptureStages();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"
-            line="63"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1217,9 +997,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="59"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1228,9 +1006,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="59"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1239,9 +1015,7 @@
         errorLine1="    public List&lt;CaptureStageImpl> getCaptureStages() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="78"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1250,9 +1024,7 @@
         errorLine1="    public CaptureProcessorImpl getCaptureProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="88"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1261,9 +1033,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="97"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1272,9 +1042,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="97"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1283,9 +1051,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="98"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1294,9 +1060,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="108"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1305,9 +1069,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="124"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1316,9 +1078,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="134"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1327,9 +1087,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"
-            line="149"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1338,9 +1096,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="49"
-            column="22"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1349,9 +1105,7 @@
         errorLine1="    public void init(String cameraId, CameraCharacteristics cameraCharacteristics) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="49"
-            column="39"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1360,9 +1114,7 @@
         errorLine1="    public CaptureStageImpl getCaptureStage() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="65"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1371,9 +1123,7 @@
         errorLine1="    public ProcessorType getProcessorType() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="75"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1382,9 +1132,7 @@
         errorLine1="    public ProcessorImpl getProcessor() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="80"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1393,9 +1141,7 @@
         errorLine1="    public List&lt;Pair&lt;Integer, Size[]&gt;> getSupportedResolutions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="85"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1404,9 +1150,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="90"
-            column="24"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1415,9 +1159,7 @@
         errorLine1="    public void onInit(String cameraId, CameraCharacteristics cameraCharacteristics,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="90"
-            column="41"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1426,9 +1168,7 @@
         errorLine1="            Context context) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="91"
-            column="13"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1437,9 +1177,7 @@
         errorLine1="    public CaptureStageImpl onPresetSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="101"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1448,9 +1186,7 @@
         errorLine1="    public CaptureStageImpl onEnableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="117"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1459,9 +1195,7 @@
         errorLine1="    public CaptureStageImpl onDisableSession() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"
-            line="127"
-            column="12"/>
+            file="src/main/java/androidx/camera/extensions/impl/NightPreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1470,9 +1204,7 @@
         errorLine1="    boolean isExtensionAvailable(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="54"
-            column="34"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1481,9 +1213,7 @@
         errorLine1="    boolean isExtensionAvailable(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="54"
-            column="51"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1492,9 +1222,7 @@
         errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="65"
-            column="15"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1503,9 +1231,7 @@
         errorLine1="    void init(String cameraId, CameraCharacteristics cameraCharacteristics);"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="65"
-            column="32"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1514,9 +1240,7 @@
         errorLine1="    CaptureStageImpl getCaptureStage();"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="78"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1525,9 +1249,7 @@
         errorLine1="    ProcessorType getProcessorType();"
         errorLine2="    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="81"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1536,9 +1258,7 @@
         errorLine1="    ProcessorImpl getProcessor();"
         errorLine2="    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"
-            line="96"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewExtenderImpl.java"/>
     </issue>
 
     <issue
@@ -1547,9 +1267,7 @@
         errorLine1="    void process(Image image, TotalCaptureResult result);"
         errorLine2="                 ~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"
-            line="43"
-            column="18"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1558,9 +1276,7 @@
         errorLine1="    void process(Image image, TotalCaptureResult result);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"
-            line="43"
-            column="31"/>
+            file="src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1569,9 +1285,7 @@
         errorLine1="    void onOutputSurface(Surface surface, int imageFormat);"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"
-            line="37"
-            column="26"/>
+            file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1580,9 +1294,7 @@
         errorLine1="    void onResolutionUpdate(Size size);"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"
-            line="47"
-            column="29"/>
+            file="src/main/java/androidx/camera/extensions/impl/ProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1591,9 +1303,7 @@
         errorLine1="    CaptureStageImpl process(TotalCaptureResult result);"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"
-            line="38"
-            column="5"/>
+            file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"/>
     </issue>
 
     <issue
@@ -1602,9 +1312,7 @@
         errorLine1="    CaptureStageImpl process(TotalCaptureResult result);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"
-            line="38"
-            column="30"/>
+            file="src/main/java/androidx/camera/extensions/impl/RequestUpdateProcessorImpl.java"/>
     </issue>
 
 </issues>
diff --git a/camera/camera-viewfinder/lint-baseline.xml b/camera/camera-viewfinder/lint-baseline.xml
index 77e5f83..dad122f 100644
--- a/camera/camera-viewfinder/lint-baseline.xml
+++ b/camera/camera-viewfinder/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    ListenableFuture&lt;O> apply(@Nullable I input) throws Exception;"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/viewfinder/internal/utils/futures/AsyncFunction.java"
-            line="51"
-            column="5"/>
+            file="src/main/java/androidx/camera/viewfinder/internal/utils/futures/AsyncFunction.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    void onFailure(Throwable t);"
         errorLine2="                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/viewfinder/internal/utils/futures/FutureCallback.java"
-            line="51"
-            column="20"/>
+            file="src/main/java/androidx/camera/viewfinder/internal/utils/futures/FutureCallback.java"/>
     </issue>
 
 </issues>
diff --git a/camera/integration-tests/camerapipetestapp/lint-baseline.xml b/camera/integration-tests/camerapipetestapp/lint-baseline.xml
index af24e68..642b238 100644
--- a/camera/integration-tests/camerapipetestapp/lint-baseline.xml
+++ b/camera/integration-tests/camerapipetestapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            val elapsedRealtime = Process.getStartElapsedRealtime()"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeApplication.kt"
-            line="47"
-            column="43"/>
+            file="src/main/java/androidx/camera/integration/camera2/pipe/CameraPipeApplication.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    fun useAppContext() {"
         errorLine2="        ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/camera/integration/camera2/pipe/BasicInstrumentedTest.kt"
-            line="35"
-            column="9"/>
+            file="src/androidTest/java/androidx/camera/integration/camera2/pipe/BasicInstrumentedTest.kt"/>
     </issue>
 
 </issues>
diff --git a/camera/integration-tests/coretestapp/lint-baseline.xml b/camera/integration-tests/coretestapp/lint-baseline.xml
index 7781dbb..e4f9bbf 100644
--- a/camera/integration-tests/coretestapp/lint-baseline.xml
+++ b/camera/integration-tests/coretestapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            mImageAnalysisResult.setValue("
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="213"
-            column="13"/>
+            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                if (!mAnalysisIdlingResource.isIdleNow()) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="216"
-            column="22"/>
+            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                    mAnalysisIdlingResource.decrement();"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="217"
-            column="21"/>
+            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                        mImageSavedIdlingResource.increment();"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="572"
-            column="25"/>
+            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                        createDefaultPictureFolderIfNotExist();"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="575"
-            column="25"/>
+            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                                mImageCaptureExecutorService,"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="584"
-            column="33"/>
+            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                                            mImageSavedIdlingResource.decrement();"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="593"
-            column="45"/>
+            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                                            mImageSavedIdlingResource.decrement();"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="615"
-            column="45"/>
+            file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                            if (mCameraProvider != null) {"
         errorLine2="                                ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/OpenGLActivity.java"
-            line="262"
-            column="33"/>
+            file="src/main/java/androidx/camera/integration/core/OpenGLActivity.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                                startCamera();"
         errorLine2="                                ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/OpenGLActivity.java"
-            line="263"
-            column="33"/>
+            file="src/main/java/androidx/camera/integration/core/OpenGLActivity.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/OpenGLActivity.java"
-            line="97"
-            column="26"/>
+            file="src/main/java/androidx/camera/integration/core/OpenGLActivity.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public static View chooseViewFinder(@Nullable Bundle intentExtras,"
         errorLine2="                  ~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/core/OpenGLActivity.java"
-            line="202"
-            column="19"/>
+            file="src/main/java/androidx/camera/integration/core/OpenGLActivity.java"/>
     </issue>
 
 </issues>
diff --git a/camera/integration-tests/timingtestapp/lint-baseline.xml b/camera/integration-tests/timingtestapp/lint-baseline.xml
index 2b77cb0..4986493 100644
--- a/camera/integration-tests/timingtestapp/lint-baseline.xml
+++ b/camera/integration-tests/timingtestapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    physicalCameras = cameraChars.physicalCameraIds"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/antelope/CameraUtils.kt"
-            line="190"
-            column="51"/>
+            file="src/main/java/androidx/camera/integration/antelope/CameraUtils.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        released = texture.isReleased"
         errorLine2="                           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt"
-            line="282"
-            column="28"/>
+            file="src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt"/>
     </issue>
 
 </issues>
diff --git a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
index 1ed89c9..d3d401e 100644
--- a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
+++ b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                val display = mDisplayManager.getDisplay(displayId)"
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/camera/integration/uiwidgets/rotations/OrientationConfigChangesOverriddenActivity.kt"
-            line="33"
-            column="31"/>
+            file="src/main/java/androidx/camera/integration/uiwidgets/rotations/OrientationConfigChangesOverriddenActivity.kt"/>
     </issue>
 
 </issues>
diff --git a/car/app/app-samples/navigation/common/lint-baseline.xml b/car/app/app-samples/navigation/common/lint-baseline.xml
index 6f135d7..1dc0a34 100644
--- a/car/app/app-samples/navigation/common/lint-baseline.xml
+++ b/car/app/app-samples/navigation/common/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    new NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_HIGH);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java"
-            line="103"
-            column="21"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            notificationManager.createNotificationChannel(serviceChannel);"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java"
-            line="104"
-            column="33"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK)"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="461"
-            column="17"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                        .setAudioAttributes(audioAttributes)"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="462"
-            column="26"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                        .build();"
         errorLine2="                         ~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="463"
-            column="26"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                        audioManager.abandonAudioFocusRequest(request);"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="476"
-            column="38"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        if (audioManager.requestAudioFocus(request) != AUDIOFOCUS_REQUEST_GRANTED) {"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="481"
-            column="26"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            audioManager.abandonAudioFocusRequest(request);"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="498"
-            column="26"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                    new NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_HIGH);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="514"
-            column="21"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="            mNotificationManager.createNotificationChannel(serviceChannel);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="515"
-            column="34"/>
+            file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"/>
     </issue>
 
 </issues>
diff --git a/car/app/app-samples/showcase/common/lint-baseline.xml b/car/app/app-samples/showcase/common/lint-baseline.xml
index 9f08150..ec7df9b 100644
--- a/car/app/app-samples/showcase/common/lint-baseline.xml
+++ b/car/app/app-samples/showcase/common/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                                        context.startForegroundService(intent);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationNotificationsDemoScreen.java"
-            line="59"
-            column="49"/>
+            file="src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationNotificationsDemoScreen.java"/>
     </issue>
 
 </issues>
diff --git a/car/app/app-testing/lint-baseline.xml b/car/app/app-testing/lint-baseline.xml
index 5a97f63..b0f5029 100644
--- a/car/app/app-testing/lint-baseline.xml
+++ b/car/app/app-testing/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofMinutes(1)).build();"
         errorLine2="                                                                         ~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="73"
-            column="74"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofMinutes(1)).build();"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="73"
-            column="48"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofHours(1)).build();"
         errorLine2="                                                                         ~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="78"
-            column="74"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofHours(1)).build();"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="78"
-            column="48"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofMinutes(2)).build();"
         errorLine2="                                                                         ~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="105"
-            column="74"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofMinutes(2)).build();"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="105"
-            column="48"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofHours(2)).build();"
         errorLine2="                                                                         ~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="110"
-            column="74"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofHours(2)).build();"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="110"
-            column="48"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofMinutes(3)).build();"
         errorLine2="                                                                         ~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="126"
-            column="74"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofMinutes(3)).build();"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="126"
-            column="48"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofHours(3)).build();"
         errorLine2="                                                                         ~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="131"
-            column="74"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="                                &quot;US/Pacific&quot;)).setRemainingTime(Duration.ofHours(3)).build();"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"
-            line="131"
-            column="48"/>
+            file="src/test/java/androidx/car/app/testing/navigation/TestNavigationManagerTest.java"/>
     </issue>
 
 </issues>
diff --git a/car/app/app/lint-baseline.xml b/car/app/app/lint-baseline.xml
index 54d27f7..c96c361 100644
--- a/car/app/app/lint-baseline.xml
+++ b/car/app/app/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        assertThat(actions.get(0).getIcon().getResId()).isEqualTo(icon1);"
         errorLine2="                                            ~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/notification/CarAppExtenderTest.java"
-            line="209"
-            column="45"/>
+            file="src/test/java/androidx/car/app/notification/CarAppExtenderTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        assertThat(actions.get(1).getIcon().getResId()).isEqualTo(icon2);"
         errorLine2="                                            ~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/notification/CarAppExtenderTest.java"
-            line="212"
-            column="45"/>
+            file="src/test/java/androidx/car/app/notification/CarAppExtenderTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        assertThat(mCarContext.getResources().getConfiguration().getLocales().get(0))"
         errorLine2="                                                                 ~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/CarContextTest.java"
-            line="258"
-            column="66"/>
+            file="src/test/java/androidx/car/app/CarContextTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        assertThat(mCarContext.getResources().getConfiguration().getLocales().get(0))"
         errorLine2="                                                                              ~~~">
         <location
-            file="src/test/java/androidx/car/app/CarContextTest.java"
-            line="258"
-            column="79"/>
+            file="src/test/java/androidx/car/app/CarContextTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        assertThat(changed.getChannelId()).isEqualTo(EXTENDED_CHANNEL);"
         errorLine2="                           ~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/notification/CarNotificationManagerTest.java"
-            line="112"
-            column="28"/>
+            file="src/test/java/androidx/car/app/notification/CarNotificationManagerTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        assertThat(output.getChannelId()).isEqualTo(DEFAULT_CHANNEL);"
         errorLine2="                          ~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/notification/CarNotificationManagerTest.java"
-            line="137"
-            column="27"/>
+            file="src/test/java/androidx/car/app/notification/CarNotificationManagerTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        assertThat(output.getChannelId()).isEqualTo(DEFAULT_CHANNEL);"
         errorLine2="                          ~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/car/app/notification/CarNotificationManagerTest.java"
-            line="165"
-            column="27"/>
+            file="src/test/java/androidx/car/app/notification/CarNotificationManagerTest.java"/>
     </issue>
 
     <issue
diff --git a/cardview/cardview/lint-baseline.xml b/cardview/cardview/lint-baseline.xml
index 0bcfadf..351d5b9 100644
--- a/cardview/cardview/lint-baseline.xml
+++ b/cardview/cardview/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            final TypedArray aa = getContext().obtainStyledAttributes(COLOR_BACKGROUND_ATTR);"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/cardview/widget/CardView.java"
-            line="133"
-            column="71"/>
+            file="src/main/java/androidx/cardview/widget/CardView.java"/>
     </issue>
 
 </issues>
diff --git a/compose/animation/animation-core/lint-baseline.xml b/compose/animation/animation-core/lint-baseline.xml
index 27d3100..4352831 100644
--- a/compose/animation/animation-core/lint-baseline.xml
+++ b/compose/animation/animation-core/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        testCases.parallelStream().forEach {"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/compose/animation/core/SpringEstimationTest.kt"
-            line="54"
-            column="19"/>
+            file="src/test/java/androidx/compose/animation/core/SpringEstimationTest.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        testCases.parallelStream().forEach {"
         errorLine2="                                   ~~~~~~~">
         <location
-            file="src/test/java/androidx/compose/animation/core/SpringEstimationTest.kt"
-            line="54"
-            column="36"/>
+            file="src/test/java/androidx/compose/animation/core/SpringEstimationTest.kt"/>
     </issue>
 
 </issues>
diff --git a/compose/foundation/foundation-layout/lint-baseline.xml b/compose/foundation/foundation-layout/lint-baseline.xml
index ae3be09..4073808 100644
--- a/compose/foundation/foundation-layout/lint-baseline.xml
+++ b/compose/foundation/foundation-layout/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        val bitmap = activityTestRule.waitAndScreenShot()"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/BoxWithConstraintsTest.kt"
-            line="688"
-            column="39"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/BoxWithConstraintsTest.kt"/>
     </issue>
 
 </issues>
diff --git a/compose/material/material/lint-baseline.xml b/compose/material/material/lint-baseline.xml
index 3561ada..6c2f717 100644
--- a/compose/material/material/lint-baseline.xml
+++ b/compose/material/material/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            .captureToImage()"
         errorLine2="             ~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/material/BadgeTest.kt"
-            line="124"
-            column="14"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/material/BadgeTest.kt"/>
     </issue>
 
 </issues>
diff --git a/compose/ui/ui-text/benchmark/lint-baseline.xml b/compose/ui/ui-text/benchmark/lint-baseline.xml
index 4ddcf80..f4de848 100644
--- a/compose/ui/ui-text/benchmark/lint-baseline.xml
+++ b/compose/ui/ui-text/benchmark/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            val freeCaches = Canvas::class.java.getDeclaredMethod(&quot;freeTextLayoutCaches&quot;)"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/compose/ui/text/benchmark/TextBenchmarkTestRule.kt"
-            line="79"
-            column="30"/>
+            file="src/main/java/androidx/compose/ui/text/benchmark/TextBenchmarkTestRule.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            freeCaches.invoke(null)"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/compose/ui/text/benchmark/TextBenchmarkTestRule.kt"
-            line="81"
-            column="13"/>
+            file="src/main/java/androidx/compose/ui/text/benchmark/TextBenchmarkTestRule.kt"/>
     </issue>
 
 </issues>
diff --git a/compose/ui/ui/lint-baseline.xml b/compose/ui/ui/lint-baseline.xml
index cfb4ef4..0457ce8 100644
--- a/compose/ui/ui/lint-baseline.xml
+++ b/compose/ui/ui/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        val bitmap = rule.waitAndScreenShot()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/AlphaTest.kt"
-            line="231"
-            column="27"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/AlphaTest.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        RenderNodeApi29(AndroidComposeView(activity)).apply {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"
-            line="227"
-            column="9"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            this.cameraDistance = cameraDistance"
         errorLine2="                 ~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"
-            line="228"
-            column="18"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        }.dumpRenderNodeData().cameraDistance == cameraDistance"
         errorLine2="          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"
-            line="229"
-            column="11"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        RenderNodeApi23(AndroidComposeView(activity)).apply {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"
-            line="234"
-            column="9"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            this.cameraDistance = cameraDistance"
         errorLine2="                 ~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"
-            line="235"
-            column="18"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        }.dumpRenderNodeData().cameraDistance == -cameraDistance // Camera distance is negative"
         errorLine2="          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"
-            line="236"
-            column="11"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    val bitmap = waitAndScreenShot()"
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"
-            line="3869"
-            column="18"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/AndroidLayoutDrawTest.kt"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        val bitmap = rule.waitAndScreenShot()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/ClipDrawTest.kt"
-            line="524"
-            column="27"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/ClipDrawTest.kt"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        parcel?.readBoolean()"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/platform/DisposableSaveableStateRegistryTest.kt"
-            line="184"
-            column="17"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/platform/DisposableSaveableStateRegistryTest.kt"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        parcel?.readBoolean()"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/platform/DisposableSaveableStateRegistryTest.kt"
-            line="184"
-            column="17"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/platform/DisposableSaveableStateRegistryTest.kt"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        parcel.writeBoolean(true)"
         errorLine2="               ~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/platform/DisposableSaveableStateRegistryTest.kt"
-            line="188"
-            column="16"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/platform/DisposableSaveableStateRegistryTest.kt"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    fun SemanticsNodeInteraction.captureToBitmap() = captureToImage().asAndroidBitmap()"
         errorLine2="                                                     ~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/DrawModifierTest.kt"
-            line="632"
-            column="54"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/DrawModifierTest.kt"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="            .captureToImage()"
         errorLine2="             ~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/InvalidatingNotPlacedChildTest.kt"
-            line="378"
-            column="14"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/InvalidatingNotPlacedChildTest.kt"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="        val bitmap = rule.waitAndScreenShot()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/ShadowTest.kt"
-            line="377"
-            column="27"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/ShadowTest.kt"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="        val bitmap = rule.onRoot().captureToImage().asAndroidBitmap()"
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/vector/VectorTest.kt"
-            line="694"
-            column="36"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/vector/VectorTest.kt"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    fun testNoopBlur() {"
         errorLine2="        ~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"
-            line="58"
-            column="9"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    fun testRectBoundedBlur() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"
-            line="138"
-            column="9"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    fun testUnboundedBlur() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"
-            line="151"
-            column="9"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    fun testCircleBoundedBlur() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"
-            line="164"
-            column="9"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    fun testRectangleBlurredEdgeTreatmentHasShape() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"
-            line="174"
-            column="9"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    fun testUnboundedBlurredEdgeTreatmentDoesNotHaveShape() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"
-            line="179"
-            column="9"/>
+            file="src/androidAndroidTest/kotlin/androidx/compose/ui/draw/BlurTest.kt"/>
     </issue>
 
 </issues>
diff --git a/concurrent/concurrent-futures/lint-baseline.xml b/concurrent/concurrent-futures/lint-baseline.xml
index bf68926..e0c0f6d 100644
--- a/concurrent/concurrent-futures/lint-baseline.xml
+++ b/concurrent/concurrent-futures/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                            @Override"
         errorLine2="                            ^">
         <location
-            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"
-            line="224"
-            column="29"/>
+            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        @Override"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/concurrent/futures/CallbackToFutureAdapter.java"
-            line="361"
-            column="9"/>
+            file="src/main/java/androidx/concurrent/futures/CallbackToFutureAdapter.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public final void addListener(Runnable listener, Executor executor) {"
         errorLine2="                                  ~~~~~~~~">
         <location
-            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"
-            line="652"
-            column="35"/>
+            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public final void addListener(Runnable listener, Executor executor) {"
         errorLine2="                                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"
-            line="652"
-            column="54"/>
+            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    protected boolean setException(Throwable throwable) {"
         errorLine2="                                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"
-            line="709"
-            column="36"/>
+            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    protected boolean setFuture(ListenableFuture&lt;? extends V> future) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"
-            line="745"
-            column="33"/>
+            file="src/main/java/androidx/concurrent/futures/AbstractResolvableFuture.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public static &lt;V> ResolvableFuture&lt;V> create() {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/concurrent/futures/ResolvableFuture.java"
-            line="44"
-            column="23"/>
+            file="src/main/java/androidx/concurrent/futures/ResolvableFuture.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public boolean setException(Throwable throwable) {"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/concurrent/futures/ResolvableFuture.java"
-            line="54"
-            column="33"/>
+            file="src/main/java/androidx/concurrent/futures/ResolvableFuture.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public boolean setFuture(ListenableFuture&lt;? extends V> future) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/concurrent/futures/ResolvableFuture.java"
-            line="59"
-            column="30"/>
+            file="src/main/java/androidx/concurrent/futures/ResolvableFuture.java"/>
     </issue>
 
 </issues>
diff --git a/contentpager/contentpager/lint-baseline.xml b/contentpager/contentpager/lint-baseline.xml
index fd2a6ec..afaf7df 100644
--- a/contentpager/contentpager/lint-baseline.xml
+++ b/contentpager/contentpager/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        c.setExtras(extras);"
         errorLine2="          ~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/contentpager/content/TestContentProvider.java"
-            line="245"
-            column="11"/>
+            file="src/androidTest/java/androidx/contentpager/content/TestContentProvider.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            setWindow(new CursorWindow(&quot;stevie&quot;));"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/contentpager/content/TestContentProvider.java"
-            line="377"
-            column="23"/>
+            file="src/androidTest/java/androidx/contentpager/content/TestContentProvider.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        cursor.setExtras(extras);"
         errorLine2="               ~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/contentpager/content/TestQueryCallback.java"
-            line="51"
-            column="16"/>
+            file="src/androidTest/java/androidx/contentpager/content/TestQueryCallback.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            extras = extras.deepCopy();"
         errorLine2="                            ~~~~~~~~">
         <location
-            file="src/main/java/androidx/contentpager/content/ContentPager.java"
-            line="504"
-            column="29"/>
+            file="src/main/java/androidx/contentpager/content/ContentPager.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            return resolver.query("
         errorLine2="                            ~~~~~">
         <location
-            file="src/main/java/androidx/contentpager/content/Query.java"
-            line="116"
-            column="29"/>
+            file="src/main/java/androidx/contentpager/content/Query.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            return resolver.query("
         errorLine2="                            ~~~~~">
         <location
-            file="src/main/java/androidx/contentpager/content/Query.java"
-            line="125"
-            column="29"/>
+            file="src/main/java/androidx/contentpager/content/Query.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            if (mCancellationSignal != null &amp;&amp; !mCancellationSignal.isCanceled()) {"
         errorLine2="                                                                    ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/contentpager/content/Query.java"
-            line="145"
-            column="69"/>
+            file="src/main/java/androidx/contentpager/content/Query.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                mCancellationSignal.cancel();"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/androidx/contentpager/content/Query.java"
-            line="149"
-            column="37"/>
+            file="src/main/java/androidx/contentpager/content/Query.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public ContentPager(ContentResolver resolver, QueryRunner queryRunner) {"
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/contentpager/content/ContentPager.java"
-            line="218"
-            column="25"/>
+            file="src/main/java/androidx/contentpager/content/ContentPager.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public ContentPager(ContentResolver resolver, QueryRunner queryRunner) {"
         errorLine2="                                                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/contentpager/content/ContentPager.java"
-            line="218"
-            column="51"/>
+            file="src/main/java/androidx/contentpager/content/ContentPager.java"/>
     </issue>
 
 </issues>
diff --git a/coordinatorlayout/coordinatorlayout/lint-baseline.xml b/coordinatorlayout/coordinatorlayout/lint-baseline.xml
index 9d9465b..11cf628 100644
--- a/coordinatorlayout/coordinatorlayout/lint-baseline.xml
+++ b/coordinatorlayout/coordinatorlayout/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            return &quot;MotionEvent#getAction() == &quot; + MotionEvent.actionToString(mAction);"
         errorLine2="                                                               ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTouchEventTest.java"
-            line="561"
-            column="64"/>
+            file="src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTouchEventTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void setOnHierarchyChangeListener(OnHierarchyChangeListener onHierarchyChangeListener) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="255"
-            column="46"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    protected boolean verifyDrawable(Drawable who) {"
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="345"
-            column="38"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public final WindowInsetsCompat getLastWindowInsets() {"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="397"
-            column="18"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public boolean onInterceptTouchEvent(MotionEvent ev) {"
         errorLine2="                                         ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="562"
-            column="42"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public boolean onTouchEvent(MotionEvent ev) {"
         errorLine2="                                ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="584"
-            column="33"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public void onMeasureChild(View child, int parentWidthMeasureSpec, int widthUsed,"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="793"
-            column="32"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public void onDraw(Canvas c) {"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="960"
-            column="24"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    protected boolean drawChild(Canvas canvas, View child, long drawingTime) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1287"
-            column="33"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    protected boolean drawChild(Canvas canvas, View child, long drawingTime) {"
         errorLine2="                                               ~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1287"
-            column="48"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public LayoutParams generateLayoutParams(AttributeSet attrs) {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1761"
-            column="12"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public LayoutParams generateLayoutParams(AttributeSet attrs) {"
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1761"
-            column="46"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1766"
-            column="15"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1766"
-            column="49"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    protected LayoutParams generateDefaultLayoutParams() {"
         errorLine2="              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1776"
-            column="15"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1781"
-            column="41"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {"
         errorLine2="                                       ~~~~">
         <location
-            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1786"
-            column="40"/>
+            file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"/>
     </issue>
 
     <issue
@@ -195,7 +161,6 @@
         errorLine2="                                                   ~~~~">
         <location
             file="src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java"
-            line="1786"
             column="52"/>
     </issue>
 
diff --git a/core/core-animation/lint-baseline.xml b/core/core-animation/lint-baseline.xml
index d3f219e2..c6237fb 100644
--- a/core/core-animation/lint-baseline.xml
+++ b/core/core-animation/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    AndroidResources.STYLEABLE_ACCELERATE_INTERPOLATOR, 0, 0);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AccelerateInterpolator.java"
-            line="71"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/AccelerateInterpolator.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            a = res.obtainAttributes(attrs, AndroidResources.STYLEABLE_ACCELERATE_INTERPOLATOR);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AccelerateInterpolator.java"
-            line="73"
-            column="45"/>
+            file="src/main/java/androidx/core/animation/AccelerateInterpolator.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    static final int STYLEABLE_ANTICIPATEOVERSHOOT_INTERPOLATOR_EXTRA_TENSION = 1;"
         errorLine2="                                                                                ~">
         <location
-            file="src/main/java/androidx/core/animation/AndroidResources.java"
-            line="29"
-            column="81"/>
+            file="src/main/java/androidx/core/animation/AndroidResources.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    a = theme.obtainStyledAttributes(attrs, AndroidResources.STYLEABLE_ANIMATOR_SET,"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="449"
-            column="61"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                    a = res.obtainAttributes(attrs, AndroidResources.STYLEABLE_ANIMATOR_SET);"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="452"
-            column="53"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                            AndroidResources.STYLEABLE_PROPERTY_VALUES_HOLDER, 0, 0);"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="510"
-            column="29"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                            AndroidResources.STYLEABLE_PROPERTY_VALUES_HOLDER);"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="513"
-            column="29"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            a = theme.obtainStyledAttributes(attrs, AndroidResources.STYLEABLE_KEYFRAME, 0, 0);"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="558"
-            column="53"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            a = res.obtainAttributes(attrs, AndroidResources.STYLEABLE_KEYFRAME);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="560"
-            column="45"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="            a = theme.obtainStyledAttributes(attrs, AndroidResources.STYLEABLE_KEYFRAME, 0, 0);"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="728"
-            column="53"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            a = res.obtainAttributes(attrs, AndroidResources.STYLEABLE_KEYFRAME);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="730"
-            column="45"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="            arrayAnimator = theme.obtainStyledAttributes(attrs, AndroidResources.STYLEABLE_ANIMATOR,"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="803"
-            column="65"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="            arrayAnimator = res.obtainAttributes(attrs, AndroidResources.STYLEABLE_ANIMATOR);"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="806"
-            column="57"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                        AndroidResources.STYLEABLE_PROPERTY_ANIMATOR, 0, 0);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="813"
-            column="25"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                        AndroidResources.STYLEABLE_PROPERTY_ANIMATOR);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnimatorInflater.java"
-            line="816"
-            column="25"/>
+            file="src/main/java/androidx/core/animation/AnimatorInflater.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                    AndroidResources.STYLEABLE_ANTICIPATEOVERSHOOT_INTERPOLATOR, 0, 0);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnticipateInterpolator.java"
-            line="67"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/AnticipateInterpolator.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                    AndroidResources.STYLEABLE_ANTICIPATEOVERSHOOT_INTERPOLATOR);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnticipateInterpolator.java"
-            line="70"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/AnticipateInterpolator.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                    AndroidResources.STYLEABLE_ANTICIPATEOVERSHOOT_INTERPOLATOR, 0, 0);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnticipateOvershootInterpolator.java"
-            line="77"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/AnticipateOvershootInterpolator.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                    AndroidResources.STYLEABLE_ANTICIPATEOVERSHOOT_INTERPOLATOR);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/AnticipateOvershootInterpolator.java"
-            line="80"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/AnticipateOvershootInterpolator.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="            a = theme.obtainStyledAttributes(attrs, AndroidResources.STYLEABLE_CYCLE_INTERPOLATOR,"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/CycleInterpolator.java"
-            line="58"
-            column="53"/>
+            file="src/main/java/androidx/core/animation/CycleInterpolator.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="            a = resources.obtainAttributes(attrs, AndroidResources.STYLEABLE_CYCLE_INTERPOLATOR);"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/CycleInterpolator.java"
-            line="61"
-            column="51"/>
+            file="src/main/java/androidx/core/animation/CycleInterpolator.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="                    AndroidResources.STYLEABLE_DECELERATE_INTERPOLATOR, 0, 0);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/DecelerateInterpolator.java"
-            line="57"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/DecelerateInterpolator.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="            a = res.obtainAttributes(attrs, AndroidResources.STYLEABLE_DECELERATE_INTERPOLATOR);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/DecelerateInterpolator.java"
-            line="59"
-            column="45"/>
+            file="src/main/java/androidx/core/animation/DecelerateInterpolator.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="                    AndroidResources.STYLEABLE_OVERSHOOT_INTERPOLATOR, 0, 0);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/OvershootInterpolator.java"
-            line="57"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/OvershootInterpolator.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="            a = res.obtainAttributes(attrs, AndroidResources.STYLEABLE_OVERSHOOT_INTERPOLATOR);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/OvershootInterpolator.java"
-            line="59"
-            column="45"/>
+            file="src/main/java/androidx/core/animation/OvershootInterpolator.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="            a = theme.obtainStyledAttributes(attrs, AndroidResources.STYLEABLE_PATH_INTERPOLATOR,"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PathInterpolator.java"
-            line="126"
-            column="53"/>
+            file="src/main/java/androidx/core/animation/PathInterpolator.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="            a = res.obtainAttributes(attrs, AndroidResources.STYLEABLE_PATH_INTERPOLATOR);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PathInterpolator.java"
-            line="129"
-            column="45"/>
+            file="src/main/java/androidx/core/animation/PathInterpolator.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="                        Object value = convertBack(mGetter.invoke(target));"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="895"
-            column="52"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="                Object value = convertBack(mGetter.invoke(target));"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="941"
-            column="44"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="                mSetter.invoke(target, mTmpValueArray);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="1012"
-            column="17"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="                mSetter.invoke(target, mTmpValueArray);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="1242"
-            column="17"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="                    mSetter.invoke(target, mTmpValueArray);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="1341"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="                    mSetter.invoke(target, boxedValues);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="1386"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="                    mSetter.invoke(target, boxedValues);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="1486"
-            column="21"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -381,13 +313,9 @@
         errorLine1="    public PropertyValuesHolder[] getValues() {"
         errorLine2="                                  ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/ValueAnimator.java"
-            line="515"
-            column="35"/>
+            file="src/main/java/androidx/core/animation/ValueAnimator.java"/>
         <location
             file="src/main/java/androidx/core/animation/ValueAnimator.java"
-            line="493"
-            column="17"
             message="Setter here"/>
     </issue>
 
@@ -397,9 +325,7 @@
         errorLine1="            @NonNull TypeEvaluator&lt;T> evaluator, @NonNull T... values) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/ObjectAnimator.java"
-            line="390"
-            column="50"/>
+            file="src/main/java/androidx/core/animation/ObjectAnimator.java"/>
     </issue>
 
     <issue
@@ -408,9 +334,7 @@
         errorLine1="            @NonNull TypeEvaluator&lt;T> evaluator, @NonNull T... values) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/ObjectAnimator.java"
-            line="608"
-            column="50"/>
+            file="src/main/java/androidx/core/animation/ObjectAnimator.java"/>
     </issue>
 
     <issue
@@ -419,9 +343,7 @@
         errorLine1="            @NonNull TypeEvaluator evaluator, @NonNull Object... values) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/ObjectAnimator.java"
-            line="639"
-            column="47"/>
+            file="src/main/java/androidx/core/animation/ObjectAnimator.java"/>
     </issue>
 
     <issue
@@ -430,9 +352,7 @@
         errorLine1="            @NonNull V... values) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/ObjectAnimator.java"
-            line="696"
-            column="13"/>
+            file="src/main/java/androidx/core/animation/ObjectAnimator.java"/>
     </issue>
 
     <issue
@@ -441,9 +361,7 @@
         errorLine1="            @NonNull TypeEvaluator&lt;V> evaluator, @NonNull V... values) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/ObjectAnimator.java"
-            line="732"
-            column="50"/>
+            file="src/main/java/androidx/core/animation/ObjectAnimator.java"/>
     </issue>
 
     <issue
@@ -452,9 +370,7 @@
         errorLine1="            @NonNull TypeEvaluator&lt;V> evaluator, @NonNull V... values) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="246"
-            column="50"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -463,9 +379,7 @@
         errorLine1="            @NonNull Keyframe... values) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="271"
-            column="13"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -474,9 +388,7 @@
         errorLine1="            @NonNull TypeEvaluator&lt;V> evaluator, @NonNull V... values) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="379"
-            column="50"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -485,9 +397,7 @@
         errorLine1="            @NonNull Keyframe... values) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="405"
-            column="13"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -496,9 +406,7 @@
         errorLine1="            @NonNull TypeEvaluator evaluator, @NonNull Object... values) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="429"
-            column="47"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -507,9 +415,7 @@
         errorLine1="            @NonNull TypeEvaluator&lt;V> evaluator, @NonNull V... values) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="482"
-            column="50"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -518,9 +424,7 @@
         errorLine1="            @NonNull T... values) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"
-            line="517"
-            column="13"/>
+            file="src/main/java/androidx/core/animation/PropertyValuesHolder.java"/>
     </issue>
 
     <issue
@@ -529,9 +433,7 @@
         errorLine1="            @NonNull Object... values) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/ValueAnimator.java"
-            line="385"
-            column="13"/>
+            file="src/main/java/androidx/core/animation/ValueAnimator.java"/>
     </issue>
 
 </issues>
diff --git a/core/core-appdigest/lint-baseline.xml b/core/core-appdigest/lint-baseline.xml
index 1fac620d..8e14e7e 100644
--- a/core/core-appdigest/lint-baseline.xml
+++ b/core/core-appdigest/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            getUiAutomation().adoptShellPermissionIdentity(Manifest.permission.INSTALL_PACKAGES);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java"
-            line="1032"
-            column="31"/>
+            file="src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                getUiAutomation().dropShellPermissionIdentity();"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java"
-            line="1048"
-            column="35"/>
+            file="src/androidTest/java/androidx/core/appdigest/ChecksumsTest.java"/>
     </issue>
 
 </issues>
diff --git a/core/core-google-shortcuts/lint-baseline.xml b/core/core-google-shortcuts/lint-baseline.xml
index 4053142..960ad5d 100644
--- a/core/core-google-shortcuts/lint-baseline.xml
+++ b/core/core-google-shortcuts/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        assertThat(resolveInfos.stream().anyMatch(resolveInfo ->"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/google/shortcuts/TrampolineActivityTest.java"
-            line="138"
-            column="33"/>
+            file="src/androidTest/java/androidx/core/google/shortcuts/TrampolineActivityTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        assertThat(resolveInfos.stream().anyMatch(resolveInfo ->"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/google/shortcuts/TrampolineActivityTest.java"
-            line="138"
-            column="42"/>
+            file="src/androidTest/java/androidx/core/google/shortcuts/TrampolineActivityTest.java"/>
     </issue>
 
 </issues>
diff --git a/core/core-ktx/lint-baseline.xml b/core/core-ktx/lint-baseline.xml
index 4d12e4c..7deeb3a 100644
--- a/core/core-ktx/lint-baseline.xml
+++ b/core/core-ktx/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        assertFalse(1 in array)"
         errorLine2="                      ~~">
         <location
-            file="src/androidTest/java/androidx/core/util/SparseArrayTest.kt"
-            line="42"
-            column="23"/>
+            file="src/androidTest/java/androidx/core/util/SparseArrayTest.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        assertTrue(1 in array)"
         errorLine2="                     ~~">
         <location
-            file="src/androidTest/java/androidx/core/util/SparseArrayTest.kt"
-            line="44"
-            column="22"/>
+            file="src/androidTest/java/androidx/core/util/SparseArrayTest.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        assertFalse(2 in array)"
         errorLine2="                      ~~">
         <location
-            file="src/androidTest/java/androidx/core/util/SparseArrayTest.kt"
-            line="52"
-            column="23"/>
+            file="src/androidTest/java/androidx/core/util/SparseArrayTest.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        assertTrue(2 in array)"
         errorLine2="                     ~~">
         <location
-            file="src/androidTest/java/androidx/core/util/SparseArrayTest.kt"
-            line="55"
-            column="22"/>
+            file="src/androidTest/java/androidx/core/util/SparseArrayTest.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        view.updatePaddingRelative(start = 10, end = 20)"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/view/ViewTest.kt"
-            line="142"
-            column="14"/>
+            file="src/androidTest/java/androidx/core/view/ViewTest.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        assertEquals(10, view.paddingStart)"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/view/ViewTest.kt"
-            line="143"
-            column="31"/>
+            file="src/androidTest/java/androidx/core/view/ViewTest.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        assertEquals(20, view.paddingEnd)"
         errorLine2="                              ~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/view/ViewTest.kt"
-            line="145"
-            column="31"/>
+            file="src/androidTest/java/androidx/core/view/ViewTest.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        view.setPaddingRelative(10, 20, 30, 40)"
         errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/view/ViewTest.kt"
-            line="151"
-            column="14"/>
+            file="src/androidTest/java/androidx/core/view/ViewTest.kt"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        view.updatePaddingRelative()"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/view/ViewTest.kt"
-            line="152"
-            column="14"/>
+            file="src/androidTest/java/androidx/core/view/ViewTest.kt"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        assertEquals(10, view.paddingStart)"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/view/ViewTest.kt"
-            line="153"
-            column="31"/>
+            file="src/androidTest/java/androidx/core/view/ViewTest.kt"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        assertEquals(30, view.paddingEnd)"
         errorLine2="                              ~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/view/ViewTest.kt"
-            line="155"
-            column="31"/>
+            file="src/androidTest/java/androidx/core/view/ViewTest.kt"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    addPauseListener(listener)"
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/animation/Animator.kt"
-            line="124"
-            column="5"/>
+            file="src/main/java/androidx/core/animation/Animator.kt"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    @Px start: Int = paddingStart,"
         errorLine2="                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/view/View.kt"
-            line="140"
-            column="22"/>
+            file="src/main/java/androidx/core/view/View.kt"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    @Px end: Int = paddingEnd,"
         errorLine2="                   ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/view/View.kt"
-            line="142"
-            column="20"/>
+            file="src/main/java/androidx/core/view/View.kt"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    setPaddingRelative(start, top, end, bottom)"
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/view/View.kt"
-            line="145"
-            column="5"/>
+            file="src/main/java/androidx/core/view/View.kt"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    postOnAnimationDelayed(runnable, delayInMillis)"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/view/View.kt"
-            line="208"
-            column="5"/>
+            file="src/main/java/androidx/core/view/View.kt"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    @Px start: Int = marginStart,"
         errorLine2="                     ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/core/view/ViewGroup.kt"
-            line="158"
-            column="22"/>
+            file="src/main/java/androidx/core/view/ViewGroup.kt"/>
     </issue>
 
     <issue
@@ -195,7 +161,6 @@
         errorLine2="                   ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/view/ViewGroup.kt"
-            line="160"
             column="20"/>
     </issue>
 
diff --git a/core/core/lint-baseline.xml b/core/core/lint-baseline.xml
index 6e78a6e..12f4527 100644
--- a/core/core/lint-baseline.xml
+++ b/core/core/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                return Optional.of(modeCompat);"
         errorLine2="                                ~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="74"
-            column="33"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        return Optional.empty();"
         errorLine2="                        ~~~~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="77"
-            column="25"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        mDisplayManager = (DisplayManager) mContext.getSystemService(DISPLAY_SERVICE);"
         errorLine2="                           ~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="84"
-            column="28"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        mDefaultDisplay = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);"
         errorLine2="                                          ~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="85"
-            column="43"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                findNativeMode(DisplayCompat.getSupportedModes(mContext, mDefaultDisplay)).get();"
         errorLine2="                                                                                           ~~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="112"
-            column="92"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        Display secondDisplay = mDisplayManager.getDisplay(secondDisplayId);"
         errorLine2="                                                ~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="123"
-            column="49"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                findNativeMode(DisplayCompat.getSupportedModes(mContext, secondDisplay)).get();"
         errorLine2="                                                                                         ~~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="130"
-            column="90"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                findNativeMode(DisplayCompat.getSupportedModes(mContext, mDefaultDisplay)).get();"
         errorLine2="                                                                                           ~~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="145"
-            column="92"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                findNativeMode(DisplayCompat.getSupportedModes(mContext, mDefaultDisplay)).get();"
         errorLine2="                                                                                           ~~~">
         <location
-            file="src/test/java/androidx/core/view/DisplayCompatTest.java"
-            line="166"
-            column="92"/>
+            file="src/test/java/androidx/core/view/DisplayCompatTest.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                closeable.close();"
         errorLine2="                          ~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/content/FileProviderTest.java"
-            line="491"
-            column="27"/>
+            file="src/androidTest/java/androidx/core/content/FileProviderTest.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            boolean equality = nc1.getImportance() == nc2.getImportance()"
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="175"
-            column="36"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="            boolean equality = nc1.getImportance() == nc2.getImportance()"
         errorLine2="                                                          ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="175"
-            column="59"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                    &amp;&amp; nc1.canBypassDnd() == nc2.canBypassDnd()"
         errorLine2="                           ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="176"
-            column="28"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                    &amp;&amp; nc1.canBypassDnd() == nc2.canBypassDnd()"
         errorLine2="                                                 ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="176"
-            column="50"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                    &amp;&amp; nc1.getLockscreenVisibility() == nc2.getLockscreenVisibility()"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="177"
-            column="28"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                    &amp;&amp; nc1.getLockscreenVisibility() == nc2.getLockscreenVisibility()"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="177"
-            column="61"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                    &amp;&amp; nc1.getLightColor() == nc2.getLightColor()"
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="178"
-            column="28"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                    &amp;&amp; nc1.getLightColor() == nc2.getLightColor()"
         errorLine2="                                                  ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="178"
-            column="51"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                    &amp;&amp; Objects.equals(nc1.getId(), nc2.getId())"
         errorLine2="                                          ~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="179"
-            column="43"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="                    &amp;&amp; Objects.equals(nc1.getId(), nc2.getId())"
         errorLine2="                                                       ~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="179"
-            column="56"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="                    &amp;&amp; Objects.equals(nc1.getName(), nc2.getName())"
         errorLine2="                                          ~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="180"
-            column="43"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="                    &amp;&amp; Objects.equals(nc1.getName(), nc2.getName())"
         errorLine2="                                                         ~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="180"
-            column="58"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="                    &amp;&amp; Objects.equals(nc1.getDescription(), nc2.getDescription())"
         errorLine2="                                          ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="181"
-            column="43"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="                    &amp;&amp; Objects.equals(nc1.getDescription(), nc2.getDescription())"
         errorLine2="                                                                ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="181"
-            column="65"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="                    &amp;&amp; Objects.equals(nc1.getSound(), nc2.getSound())"
         errorLine2="                                          ~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="182"
-            column="43"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="                    &amp;&amp; Objects.equals(nc1.getSound(), nc2.getSound())"
         errorLine2="                                                          ~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="182"
-            column="59"/>
+            file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"/>
     </issue>
 
     <issue
@@ -294,7 +242,6 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidTest/java/androidx/core/app/NotificationChannelCompatTest.java"
-            line="183"
             column="42"/>
     </issue>
 
diff --git a/cursoradapter/cursoradapter/lint-baseline.xml b/cursoradapter/cursoradapter/lint-baseline.xml
index 16b05a2..a676e5e 100644
--- a/cursoradapter/cursoradapter/lint-baseline.xml
+++ b/cursoradapter/cursoradapter/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public CursorAdapter(Context context, Cursor c, boolean autoRequery) {"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="104"
-            column="26"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public CursorAdapter(Context context, Cursor c, boolean autoRequery) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="104"
-            column="43"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public CursorAdapter(Context context, Cursor c, int flags) {"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="117"
-            column="26"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public CursorAdapter(Context context, Cursor c, int flags) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="117"
-            column="43"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public Cursor getCursor() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="164"
-            column="12"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public abstract View newView(Context context, Cursor cursor, ViewGroup parent);"
         errorLine2="                    ~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="260"
-            column="21"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public abstract View newView(Context context, Cursor cursor, ViewGroup parent);"
         errorLine2="                                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="260"
-            column="34"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public abstract View newView(Context context, Cursor cursor, ViewGroup parent);"
         errorLine2="                                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="260"
-            column="51"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public abstract View newView(Context context, Cursor cursor, ViewGroup parent);"
         errorLine2="                                                                 ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="260"
-            column="66"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public View newDropDownView(Context context, Cursor cursor, ViewGroup parent) {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="270"
-            column="12"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public View newDropDownView(Context context, Cursor cursor, ViewGroup parent) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="270"
-            column="33"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public View newDropDownView(Context context, Cursor cursor, ViewGroup parent) {"
         errorLine2="                                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="270"
-            column="50"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public View newDropDownView(Context context, Cursor cursor, ViewGroup parent) {"
         errorLine2="                                                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="270"
-            column="65"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public abstract void bindView(View view, Context context, Cursor cursor);"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="281"
-            column="35"/>
+            file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"/>
     </issue>
 
     <issue
@@ -162,7 +134,6 @@
         errorLine2="                                             ~~~~~~~">
         <location
             file="src/main/java/androidx/cursoradapter/widget/CursorAdapter.java"
-            line="281"
             column="46"/>
     </issue>
 
diff --git a/customview/customview/lint-baseline.xml b/customview/customview/lint-baseline.xml
index fadac89..76fd846 100644
--- a/customview/customview/lint-baseline.xml
+++ b/customview/customview/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void writeToParcel(Parcel dest, int flags) {"
         errorLine2="                              ~~~~~~">
         <location
-            file="src/main/java/androidx/customview/view/AbsSavedState.java"
-            line="86"
-            column="31"/>
+            file="src/main/java/androidx/customview/view/AbsSavedState.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public AccessibilityNodeProviderCompat getAccessibilityNodeProvider(View host) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"
-            line="156"
-            column="12"/>
+            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public AccessibilityNodeProviderCompat getAccessibilityNodeProvider(View host) {"
         errorLine2="                                                                        ~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"
-            line="156"
-            column="73"/>
+            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {"
         errorLine2="                                               ~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"
-            line="661"
-            column="48"/>
+            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"
-            line="661"
-            column="59"/>
+            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"
-            line="756"
-            column="51"/>
+            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"
-            line="756"
-            column="62"/>
+            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    protected abstract void getVisibleVirtualViews(List&lt;Integer> virtualViewIds);"
         errorLine2="                                                   ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"
-            line="1093"
-            column="52"/>
+            file="src/main/java/androidx/customview/widget/ExploreByTouchHelper.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        void obtainBounds(T data, Rect outBounds);"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/FocusStrategy.java"
-            line="443"
-            column="35"/>
+            file="src/main/java/androidx/customview/widget/FocusStrategy.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public static ViewDragHelper create(@NonNull ViewGroup forParent, @NonNull Callback cb) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ViewDragHelper.java"
-            line="363"
-            column="19"/>
+            file="src/main/java/androidx/customview/widget/ViewDragHelper.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public static ViewDragHelper create(@NonNull ViewGroup forParent, float sensitivity,"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/customview/widget/ViewDragHelper.java"
-            line="376"
-            column="19"/>
+            file="src/main/java/androidx/customview/widget/ViewDragHelper.java"/>
     </issue>
 
 </issues>
diff --git a/datastore/datastore-multiprocess/lint-baseline.xml b/datastore/datastore-multiprocess/lint-baseline.xml
index 46c783e..d56e146 100644
--- a/datastore/datastore-multiprocess/lint-baseline.xml
+++ b/datastore/datastore-multiprocess/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            ).use {"
         errorLine2="              ~~~">
         <location
-            file="src/main/java/androidx/datastore/multiprocess/SharedCounter.kt"
-            line="74"
-            column="15"/>
+            file="src/main/java/androidx/datastore/multiprocess/SharedCounter.kt"/>
     </issue>
 
 </issues>
diff --git a/datastore/datastore-sampleapp/lint-baseline.xml b/datastore/datastore-sampleapp/lint-baseline.xml
index 456d4cd..937c82f 100644
--- a/datastore/datastore-sampleapp/lint-baseline.xml
+++ b/datastore/datastore-sampleapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                        Log.e(TAG, &quot;Error reading preferences.&quot;, e)"
         errorLine2="                              ~~~">
         <location
-            file="src/main/java/com/example/datastoresampleapp/KotlinSerializationActivity.kt"
-            line="99"
-            column="31"/>
+            file="src/main/java/com/example/datastoresampleapp/KotlinSerializationActivity.kt"/>
     </issue>
 
 </issues>
diff --git a/draganddrop/draganddrop/lint-baseline.xml b/draganddrop/draganddrop/lint-baseline.xml
index 2cc2391..9eab8b1 100644
--- a/draganddrop/draganddrop/lint-baseline.xml
+++ b/draganddrop/draganddrop/lint-baseline.xml
@@ -8,7 +8,6 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidTest/java/androidx/draganddrop/DropHelperTest.java"
-            line="119"
             column="17"/>
     </issue>
 
diff --git a/drawerlayout/drawerlayout/lint-baseline.xml b/drawerlayout/drawerlayout/lint-baseline.xml
index cb360aa..3d74932 100644
--- a/drawerlayout/drawerlayout/lint-baseline.xml
+++ b/drawerlayout/drawerlayout/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                final TypedArray a = context.obtainStyledAttributes(THEME_ATTRS);"
         errorLine2="                                                                    ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="370"
-            column="69"/>
+            file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    protected Parcelable onSaveInstanceState() {"
         errorLine2="              ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"
-            line="2084"
-            column="15"/>
+            file="src/main/java/androidx/drawerlayout/widget/DrawerLayout.java"/>
     </issue>
 
 </issues>
diff --git a/dynamicanimation/dynamicanimation/lint-baseline.xml b/dynamicanimation/dynamicanimation/lint-baseline.xml
index 3d0fb84..244db36 100644
--- a/dynamicanimation/dynamicanimation/lint-baseline.xml
+++ b/dynamicanimation/dynamicanimation/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                mDurationScale = ValueAnimator.getDurationScale();"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java"
-            line="133"
-            column="48"/>
+            file="src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                property.setValue(object, value);"
         errorLine2="                         ~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"
-            line="66"
-            column="26"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public T addEndListener(OnAnimationEndListener listener) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="459"
-            column="29"/>
+            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public void removeEndListener(OnAnimationEndListener listener) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="471"
-            column="35"/>
+            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public T addUpdateListener(OnAnimationUpdateListener listener) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="488"
-            column="32"/>
+            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public void removeUpdateListener(OnAnimationUpdateListener listener) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="507"
-            column="38"/>
+            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        void onAnimationEnd(DynamicAnimation animation, boolean canceled, float value,"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="822"
-            column="29"/>
+            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        void onAnimationUpdate(DynamicAnimation animation, float value, float velocity);"
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"
-            line="841"
-            column="32"/>
+            file="src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public FlingAnimation(FloatValueHolder floatValueHolder) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"
-            line="57"
-            column="27"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public &lt;K> FlingAnimation(K object, FloatPropertyCompat&lt;K> property) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"
-            line="69"
-            column="41"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public FlingAnimation setFriction("
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"
-            line="82"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public FlingAnimation setMinValue(float minValue) {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"
-            line="109"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public FlingAnimation setMaxValue(float maxValue) {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"
-            line="122"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public FlingAnimation setStartVelocity(float startVelocity) {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"
-            line="149"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public FloatPropertyCompat(String name) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"
-            line="42"
-            column="32"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public static &lt;T> FloatPropertyCompat&lt;T> createFloatPropertyCompat("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"
-            line="56"
-            column="23"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="            final FloatProperty&lt;T> property) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"
-            line="57"
-            column="19"/>
+            file="src/main/java/androidx/dynamicanimation/animation/FloatPropertyCompat.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public SpringAnimation(FloatValueHolder floatValueHolder) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"
-            line="78"
-            column="28"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public SpringAnimation(FloatValueHolder floatValueHolder, float finalPosition) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"
-            line="98"
-            column="28"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public &lt;K> SpringAnimation(K object, FloatPropertyCompat&lt;K> property) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"
-            line="112"
-            column="42"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public &lt;K> SpringAnimation(K object, FloatPropertyCompat&lt;K> property,"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"
-            line="126"
-            column="42"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public SpringForce getSpring() {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"
-            line="137"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public SpringAnimation setSpring(SpringForce force) {"
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"
-            line="149"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public SpringAnimation setSpring(SpringForce force) {"
         errorLine2="                                     ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"
-            line="149"
-            column="38"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public SpringForce setStiffness("
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringForce.java"
-            line="135"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringForce.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public SpringForce setDampingRatio(@FloatRange(from = 0.0) float dampingRatio) {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringForce.java"
-            line="170"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringForce.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public SpringForce setFinalPosition(float finalPosition) {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/dynamicanimation/animation/SpringForce.java"
-            line="195"
-            column="12"/>
+            file="src/main/java/androidx/dynamicanimation/animation/SpringForce.java"/>
     </issue>
 
 </issues>
diff --git a/emoji/emoji-appcompat/lint-baseline.xml b/emoji/emoji-appcompat/lint-baseline.xml
index 1270d96..70fc728 100644
--- a/emoji/emoji-appcompat/lint-baseline.xml
+++ b/emoji/emoji-appcompat/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public EmojiAppCompatButton(Context context) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"
-            line="38"
-            column="33"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public EmojiAppCompatButton(Context context, AttributeSet attrs) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"
-            line="43"
-            column="33"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public EmojiAppCompatButton(Context context, AttributeSet attrs) {"
         errorLine2="                                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"
-            line="43"
-            column="50"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public EmojiAppCompatButton(Context context, AttributeSet attrs, int defStyleAttr) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"
-            line="48"
-            column="33"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public EmojiAppCompatButton(Context context, AttributeSet attrs, int defStyleAttr) {"
         errorLine2="                                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"
-            line="48"
-            column="50"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatButton.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public EmojiAppCompatEditText(Context context) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"
-            line="46"
-            column="35"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public EmojiAppCompatEditText(Context context, AttributeSet attrs) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"
-            line="51"
-            column="35"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public EmojiAppCompatEditText(Context context, AttributeSet attrs) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"
-            line="51"
-            column="52"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public EmojiAppCompatEditText(Context context, AttributeSet attrs, int defStyleAttr) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"
-            line="56"
-            column="35"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public EmojiAppCompatEditText(Context context, AttributeSet attrs, int defStyleAttr) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"
-            line="56"
-            column="52"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatEditText.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public EmojiAppCompatTextView(Context context) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"
-            line="39"
-            column="35"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public EmojiAppCompatTextView(Context context, AttributeSet attrs) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"
-            line="44"
-            column="35"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public EmojiAppCompatTextView(Context context, AttributeSet attrs) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"
-            line="44"
-            column="52"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public EmojiAppCompatTextView(Context context, AttributeSet attrs, int defStyleAttr) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"
-            line="49"
-            column="35"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public EmojiAppCompatTextView(Context context, AttributeSet attrs, int defStyleAttr) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"
-            line="49"
-            column="52"/>
+            file="src/main/java/androidx/emoji/widget/EmojiAppCompatTextView.java"/>
     </issue>
 
 </issues>
diff --git a/emoji/emoji/lint-baseline.xml b/emoji/emoji/lint-baseline.xml
index a26dec7..1182ed3 100644
--- a/emoji/emoji/lint-baseline.xml
+++ b/emoji/emoji/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        GlyphChecker mGlyphChecker = new EmojiProcessor.DefaultGlyphChecker();"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji/text/EmojiCompat.java"
-            line="971"
-            column="38"/>
+            file="src/main/java/androidx/emoji/text/EmojiCompat.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        final EmojiMetadata metadata = mock(EmojiMetadata.class);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java"
-            line="64"
-            column="45"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        final EmojiSpan span = new TypefaceEmojiSpan(metadata);"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java"
-            line="65"
-            column="32"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        final EmojiSpan[] spans = editable.getSpans(0, 1, EmojiSpan.class);"
         errorLine2="                                                          ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java"
-            line="71"
-            column="59"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        assertTrue(extractButton.hasOnClickListeners());"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java"
-            line="177"
-            column="34"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        assertFalse(extractButton.hasOnClickListeners());"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java"
-            line="199"
-            column="35"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        mInputFilter = new EmojiInputFilter(textView);"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"
-            line="58"
-            column="24"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        assertNull(mInputFilter.filter(null, 0, 1, null, 0, 1));"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"
-            line="63"
-            column="33"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        final CharSequence result = mInputFilter.filter(testString, 0, 1, null, 0, 1);"
         errorLine2="                                                 ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"
-            line="73"
-            column="50"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        final CharSequence result = mInputFilter.filter(testString, 0, 1, null, 0, 1);"
         errorLine2="                                                 ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"
-            line="85"
-            column="50"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        final CharSequence result = mInputFilter.filter(testString, 0, 1, null, 0, 1);"
         errorLine2="                                                 ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"
-            line="98"
-            column="50"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        final CharSequence result = mInputFilter.filter(testString, 0, 1, null, 0, 1);"
         errorLine2="                                                 ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"
-            line="111"
-            column="50"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        final CharSequence result = mInputFilter.filter(testString, 0, 1, null, 0, 1);"
         errorLine2="                                                 ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"
-            line="123"
-            column="50"/>
+            file="src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="            mSpans = ((Spanned) charSequence).getSpans(0, charSequence.length(), EmojiSpan.class);"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"
-            line="104"
-            column="82"/>
+            file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="            mSpans = ((Spanned) charSequence).getSpans(0, charSequence.length(), EmojiSpan.class);"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"
-            line="140"
-            column="82"/>
+            file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="            final EmojiSpan[] spans = spanned.getSpans(0, charSequence.length(), EmojiSpan.class);"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"
-            line="224"
-            column="82"/>
+            file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                    if (mResId == spans[index].getId()) {"
         errorLine2="                                               ~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"
-            line="233"
-            column="48"/>
+            file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
@@ -195,7 +161,6 @@
         errorLine2="                                                               ~~~~~">
         <location
             file="src/androidTest/java/androidx/emoji/util/EmojiMatcher.java"
-            line="240"
             column="64"/>
     </issue>
 
diff --git a/emoji2/emoji2-bundled/lint-baseline.xml b/emoji2/emoji2-bundled/lint-baseline.xml
index 4389477..29d3a3c 100644
--- a/emoji2/emoji2-bundled/lint-baseline.xml
+++ b/emoji2/emoji2-bundled/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            mSpans = ((Spanned) charSequence).getSpans(0, charSequence.length(), EmojiSpan.class);"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"
-            line="104"
-            column="82"/>
+            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            mSpans = ((Spanned) charSequence).getSpans(0, charSequence.length(), EmojiSpan.class);"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"
-            line="140"
-            column="82"/>
+            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            final EmojiSpan[] spans = spanned.getSpans(0, charSequence.length(), EmojiSpan.class);"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"
-            line="224"
-            column="82"/>
+            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    if (mResId == spans[index].getId()) {"
         errorLine2="                                               ~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"
-            line="233"
-            column="48"/>
+            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                    if (mResId == -1 || mResId == spans[index].getId()) {"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"
-            line="240"
-            column="64"/>
+            file="src/androidTest/java/androidx/emoji2/bundled/util/EmojiMatcher.java"/>
     </issue>
 
     <issue
diff --git a/emoji2/emoji2-views-helper/lint-baseline.xml b/emoji2/emoji2-views-helper/lint-baseline.xml
index df12c43..ddca6f1 100644
--- a/emoji2/emoji2-views-helper/lint-baseline.xml
+++ b/emoji2/emoji2-views-helper/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        final EmojiMetadata metadata = mock(EmojiMetadata.class);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiEditableFactoryTest.java"
-            line="65"
-            column="45"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiEditableFactoryTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        final EmojiSpan span = new TypefaceEmojiSpan(metadata);"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiEditableFactoryTest.java"
-            line="66"
-            column="32"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiEditableFactoryTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        final EmojiSpan[] spans = editable.getSpans(0, 1, EmojiSpan.class);"
         errorLine2="                                                          ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiEditableFactoryTest.java"
-            line="72"
-            column="59"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiEditableFactoryTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        mTransformationMethod = new EmojiTransformationMethod(mWrappedTransformationMethod);"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="85"
-            column="33"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        assertNull(mTransformationMethod.getTransformation(null, mView));"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="90"
-            column="42"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        mTransformationMethod.getTransformation(&quot;&quot;, null);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="96"
-            column="31"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        mTransformationMethod = new EmojiTransformationMethod(null);"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="101"
-            column="33"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        final CharSequence result = mTransformationMethod.getTransformation(mTestString, mView);"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="103"
-            column="59"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        final CharSequence result = mTransformationMethod.getTransformation(mTestString, mView);"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="111"
-            column="59"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        final CharSequence result = mTransformationMethod.getTransformation(mTestString, mView);"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="125"
-            column="59"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        final CharSequence result = mTransformationMethod.getTransformation(mTestString, mView);"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="138"
-            column="59"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        final CharSequence result = mTransformationMethod.getTransformation(mTestString, mView);"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"
-            line="151"
-            column="59"/>
+            file="src/androidTest/java/androidx/emoji2/viewsintegration/EmojiTransformationMethodTest.java"/>
     </issue>
 
 </issues>
diff --git a/emoji2/emoji2-views/lint-baseline.xml b/emoji2/emoji2-views/lint-baseline.xml
index 3669f2b..ea225ae 100644
--- a/emoji2/emoji2-views/lint-baseline.xml
+++ b/emoji2/emoji2-views/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        assertTrue(extractButton.hasOnClickListeners());"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/widget/EmojiExtractTextLayoutTest.java"
-            line="178"
-            column="34"/>
+            file="src/androidTest/java/androidx/emoji2/widget/EmojiExtractTextLayoutTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        assertFalse(extractButton.hasOnClickListeners());"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/widget/EmojiExtractTextLayoutTest.java"
-            line="200"
-            column="35"/>
+            file="src/androidTest/java/androidx/emoji2/widget/EmojiExtractTextLayoutTest.java"/>
     </issue>
 
 </issues>
diff --git a/emoji2/emoji2/lint-baseline.xml b/emoji2/emoji2/lint-baseline.xml
index 697043f..15360c4 100644
--- a/emoji2/emoji2/lint-baseline.xml
+++ b/emoji2/emoji2/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        GlyphChecker mGlyphChecker = new EmojiProcessor.DefaultGlyphChecker();"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/emoji2/text/EmojiCompat.java"
-            line="1306"
-            column="38"/>
+            file="src/main/java/androidx/emoji2/text/EmojiCompat.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            loaderCallback.onLoaded(MetadataRepo.create(mock(Typeface.class)));"
         errorLine2="                                                 ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/text/NoFontTestEmojiConfig.java"
-            line="46"
-            column="50"/>
+            file="src/androidTest/java/androidx/emoji2/text/NoFontTestEmojiConfig.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        final EmojiSpan span = mock(EmojiSpan.class);"
         errorLine2="                                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/text/SpannableBuilderTest.java"
-            line="130"
-            column="37"/>
+            file="src/androidTest/java/androidx/emoji2/text/SpannableBuilderTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        EmojiSpan[] spans = spannable.getSpans(0, spannable.length(), EmojiSpan.class);"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/text/SpannableBuilderTest.java"
-            line="141"
-            column="71"/>
+            file="src/androidTest/java/androidx/emoji2/text/SpannableBuilderTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        final EmojiSpan span = mock(EmojiSpan.class);"
         errorLine2="                                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/text/SpannableBuilderTest.java"
-            line="194"
-            column="37"/>
+            file="src/androidTest/java/androidx/emoji2/text/SpannableBuilderTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        EmojiSpan[] spans = spannable.getSpans(0, spannable.length(), EmojiSpan.class);"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/emoji2/text/SpannableBuilderTest.java"
-            line="206"
-            column="71"/>
+            file="src/androidTest/java/androidx/emoji2/text/SpannableBuilderTest.java"/>
     </issue>
 
 </issues>
diff --git a/enterprise/enterprise-feedback/lint-baseline.xml b/enterprise/enterprise-feedback/lint-baseline.xml
index abf2ebb..8765ca0 100644
--- a/enterprise/enterprise-feedback/lint-baseline.xml
+++ b/enterprise/enterprise-feedback/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        getServiceConnection().onBindingDied(mTestComponentName);"
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/enterprise/feedback/BufferedServiceConnectionTest.java"
-            line="453"
-            column="32"/>
+            file="src/test/java/androidx/enterprise/feedback/BufferedServiceConnectionTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        getServiceConnection().onBindingDied(mTestComponentName);"
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporterTest.java"
-            line="602"
-            column="32"/>
+            file="src/test/java/androidx/enterprise/feedback/DefaultKeyedAppStatesReporterTest.java"/>
     </issue>
 
 </issues>
diff --git a/exifinterface/exifinterface/lint-baseline.xml b/exifinterface/exifinterface/lint-baseline.xml
index 989791c..430092c 100644
--- a/exifinterface/exifinterface/lint-baseline.xml
+++ b/exifinterface/exifinterface/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void setGpsInfo(Location location) {"
         errorLine2="                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/exifinterface/media/ExifInterface.java"
-            line="5062"
-            column="28"/>
+            file="src/main/java/androidx/exifinterface/media/ExifInterface.java"/>
     </issue>
 
 </issues>
diff --git a/fragment/fragment/lint-baseline.xml b/fragment/fragment/lint-baseline.xml
index 19230191..8e06b0c 100644
--- a/fragment/fragment/lint-baseline.xml
+++ b/fragment/fragment/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    animator = AnimatorInflater.loadAnimator(context, nextAnim);"
         errorLine2="                                                                      ~~~~~~~~">
         <location
-            file="src/main/java/androidx/fragment/app/FragmentAnim.java"
-            line="99"
-            column="71"/>
+            file="src/main/java/androidx/fragment/app/FragmentAnim.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    assertThat(fragment.enterTransition.enteringTargets).isEmpty()"
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"
-            line="157"
-            column="25"/>
+            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    assertThat(fragment.enterTransition.enteringTargets).isEmpty()"
         errorLine2="                                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"
-            line="157"
-            column="41"/>
+            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    assertThat(fragment.enterTransition.exitingTargets).isEmpty()"
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"
-            line="158"
-            column="25"/>
+            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    assertThat(fragment.enterTransition.exitingTargets).isEmpty()"
         errorLine2="                                        ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"
-            line="158"
-            column="41"/>
+            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    assertThat(fragment.exitTransition.enteringTargets).isEmpty()"
         errorLine2="                                       ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"
-            line="159"
-            column="40"/>
+            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    assertThat(fragment.exitTransition.enteringTargets).isEmpty()"
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"
-            line="159"
-            column="25"/>
+            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    assertThat(fragment.exitTransition.exitingTargets).isEmpty()"
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"
-            line="160"
-            column="25"/>
+            file="src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt"/>
     </issue>
 
     <issue
diff --git a/graphics/graphics-core/lint-baseline.xml b/graphics/graphics-core/lint-baseline.xml
index 5bcb65c..47f99e1 100644
--- a/graphics/graphics-core/lint-baseline.xml
+++ b/graphics/graphics-core/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    fun testConfig8888() {"
         errorLine2="        ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglConfigAttributesTest.kt"
-            line="30"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglConfigAttributesTest.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    fun testConfig1010102() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglConfigAttributesTest.kt"
-            line="47"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglConfigAttributesTest.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    fun testConfigF16() {"
         errorLine2="        ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglConfigAttributesTest.kt"
-            line="63"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglConfigAttributesTest.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    fun testInclude() {"
         errorLine2="        ~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglConfigAttributesTest.kt"
-            line="80"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglConfigAttributesTest.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    fun testSupportsBufferAge() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="28"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    fun testSupportBufferAgeFromPartialUpdate() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="33"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    fun testSetDamage() {"
         errorLine2="        ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="41"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    fun testSwapBuffersWithDamage() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="49"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    fun testColorSpace() {"
         errorLine2="        ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="57"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    fun testNoConfigContext() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="65"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    fun testPixelFormatFloat() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="73"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    fun testScRgb() {"
         errorLine2="        ~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="81"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    fun testDisplayP3() {"
         errorLine2="        ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="89"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    fun testHDR() {"
         errorLine2="        ~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="97"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    fun testContextPriority() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="105"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    fun testSurfacelessContext() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="113"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    fun testFenceSync() {"
         errorLine2="        ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="121"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    fun testWaitSync() {"
         errorLine2="        ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="128"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    fun testNativeFenceSync() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="133"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    fun testExtensionsQueryStringParsing() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"
-            line="141"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglExtensionsTest.kt"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    fun testDestructuringComponents() {"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglVersionTest.kt"
-            line="28"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglVersionTest.kt"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    fun testEquals() {"
         errorLine2="        ~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglVersionTest.kt"
-            line="35"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglVersionTest.kt"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    fun testToString() {"
         errorLine2="        ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglVersionTest.kt"
-            line="40"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglVersionTest.kt"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    fun testHashCode() {"
         errorLine2="        ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/graphics/opengl/egl/EglVersionTest.kt"
-            line="45"
-            column="9"/>
+            file="src/androidTest/java/androidx/graphics/opengl/egl/EglVersionTest.kt"/>
     </issue>
 
 </issues>
diff --git a/gridlayout/gridlayout/lint-baseline.xml b/gridlayout/gridlayout/lint-baseline.xml
index eed1dd4..2da6f2d 100644
--- a/gridlayout/gridlayout/lint-baseline.xml
+++ b/gridlayout/gridlayout/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        super(context, attrs, defStyleAttr, defStyleRes);"
         errorLine2="        ~~~~~">
         <location
-            file="src/androidTest/java/androidx/gridlayout/widget/TestContentView.java"
-            line="53"
-            column="9"/>
+            file="src/androidTest/java/androidx/gridlayout/widget/TestContentView.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public GridLayout(Context context, AttributeSet attrs, int defStyle) {"
         errorLine2="                      ~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="268"
-            column="23"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public GridLayout(Context context, AttributeSet attrs, int defStyle) {"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="268"
-            column="40"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public GridLayout(Context context, AttributeSet attrs) {"
         errorLine2="                      ~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="290"
-            column="23"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public GridLayout(Context context, AttributeSet attrs) {"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="290"
-            column="40"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public GridLayout(Context context) {"
         errorLine2="                      ~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="297"
-            column="23"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public Printer getPrinter() {"
         errorLine2="           ~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="587"
-            column="12"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public void setPrinter(Printer printer) {"
         errorLine2="                           ~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="599"
-            column="28"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        public Spec rowSpec = Spec.UNDEFINED;"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1897"
-            column="16"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        public Spec columnSpec = Spec.UNDEFINED;"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1911"
-            column="16"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        public LayoutParams(Spec rowSpec, Spec columnSpec) {"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1933"
-            column="29"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        public LayoutParams(Spec rowSpec, Spec columnSpec) {"
         errorLine2="                                          ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1933"
-            column="43"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        public LayoutParams(ViewGroup.LayoutParams params) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1951"
-            column="29"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        public LayoutParams(MarginLayoutParams params) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1958"
-            column="29"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="        public LayoutParams(LayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1968"
-            column="29"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="        public LayoutParams(Context context, AttributeSet attrs) {"
         errorLine2="                            ~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1983"
-            column="29"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        public LayoutParams(Context context, AttributeSet attrs) {"
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="1983"
-            column="46"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        public Alignment getAbsoluteAlignment(boolean horizontal) {"
         errorLine2="               ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2417"
-            column="16"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public static Spec spec(int start, int size, Alignment alignment, float weight) {"
         errorLine2="                  ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2494"
-            column="19"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public static Spec spec(int start, int size, Alignment alignment, float weight) {"
         errorLine2="                                                 ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2494"
-            column="50"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public static Spec spec(int start, Alignment alignment, float weight) {"
         errorLine2="                  ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2505"
-            column="19"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public static Spec spec(int start, Alignment alignment, float weight) {"
         errorLine2="                                       ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2505"
-            column="40"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public static Spec spec(int start, int size, float weight) {"
         errorLine2="                  ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2518"
-            column="19"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public static Spec spec(int start, float weight) {"
         errorLine2="                  ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2528"
-            column="19"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public static Spec spec(int start, int size, Alignment alignment) {"
         errorLine2="                  ~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2539"
-            column="19"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public static Spec spec(int start, int size, Alignment alignment) {"
         errorLine2="                                                 ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"
-            line="2539"
-            column="50"/>
+            file="src/main/java/androidx/gridlayout/widget/GridLayout.java"/>
     </issue>
 
     <issue
diff --git a/health/health-connect-client/lint-baseline.xml b/health/health-connect-client/lint-baseline.xml
index d52020c..a2fac5e 100644
--- a/health/health-connect-client/lint-baseline.xml
+++ b/health/health-connect-client/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    private synchronized void handleRetriableDisconnection(Throwable throwable) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java"
-            line="154"
-            column="5"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                        mCurrentVersion ="
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="69"
-            column="25"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                        return mConnectionConfiguration;"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="83"
-            column="32"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                            mConnectionManager.scheduleForExecution("
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="143"
-            column="29"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                                    new BaseQueueOperation(mConnectionConfiguration));"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="144"
-            column="60"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                            mConnectionManager.scheduleForExecution("
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="150"
-            column="29"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                                    createQueueOperation(operation, settableFuture));"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="151"
-            column="37"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                operation.execute(getService(binder), settableFuture);"
         errorLine2="                                  ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="279"
-            column="35"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            RemoteFutureOperation&lt;S, R> operation, int minApiVersion) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="130"
-            column="52"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="            ClientConfiguration clientConfiguration,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="61"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            ConnectionManager connectionManager,"
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="62"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="            ServiceGetter&lt;S> serviceGetter,"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="63"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="            RemoteOperation&lt;S, Integer> remoteVersionGetter) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="64"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> execute(RemoteOperation&lt;S, R> operation) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="102"
-            column="19"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> execute(RemoteOperation&lt;S, R> operation) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="102"
-            column="47"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> execute(RemoteFutureOperation&lt;S, R> operation) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="114"
-            column="19"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> execute(RemoteFutureOperation&lt;S, R> operation) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="114"
-            column="47"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> executeWithVersionCheck("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="129"
-            column="19"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="            RemoteFutureOperation&lt;S, R> operation, int minApiVersion) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="130"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    protected ListenableFuture&lt;Integer> getCurrentRemoteVersion(boolean forceRefresh) {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="169"
-            column="15"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> registerListener("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="196"
-            column="19"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteOperation&lt;S, R> registerListenerOperation) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="197"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteOperation&lt;S, R> registerListenerOperation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="197"
-            column="38"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> registerListener("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="217"
-            column="19"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteFutureOperation&lt;S, R> registerListenerOperation) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="218"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteFutureOperation&lt;S, R> registerListenerOperation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="218"
-            column="38"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> unregisterListener("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="235"
-            column="19"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteOperation&lt;S, R> unregisterListenerOperation) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="236"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteOperation&lt;S, R> unregisterListenerOperation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="236"
-            column="38"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> unregisterListener("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="253"
-            column="19"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteFutureOperation&lt;S, R> unregisterListenerOperation) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="254"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteFutureOperation&lt;S, R> unregisterListenerOperation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"
-            line="254"
-            column="38"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    public ClientConfiguration(String apiClientName, String servicePackageName, String bindAction) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"
-            line="34"
-            column="32"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public ClientConfiguration(String apiClientName, String servicePackageName, String bindAction) {"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"
-            line="34"
-            column="54"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    public ClientConfiguration(String apiClientName, String servicePackageName, String bindAction) {"
         errorLine2="                                                                                ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"
-            line="34"
-            column="81"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    public String getServicePackageName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"
-            line="41"
-            column="12"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    public String getBindAction() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"
-            line="46"
-            column="12"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    public String getApiClientName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="            String packageName,"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java"
-            line="37"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="            String clientName,"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java"
-            line="38"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="            String bindAction,"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java"
-            line="39"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="            QueueOperation refreshVersionOperation) {"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java"
-            line="40"
-            column="13"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    public ConnectionManager(Context context, Looper looper) {"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="52"
-            column="30"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public ConnectionManager(Context context, Looper looper) {"
         errorLine2="                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="52"
-            column="47"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public void scheduleForExecution(QueueOperation operation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="62"
-            column="38"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    public void registerListener(ListenerKey listenerKey, QueueOperation registerOperation) {"
         errorLine2="                                 ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="73"
-            column="34"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    public void registerListener(ListenerKey listenerKey, QueueOperation registerOperation) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="73"
-            column="59"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public void unregisterListener(ListenerKey listenerKey, QueueOperation unregisterOperation) {"
         errorLine2="                                   ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="86"
-            column="36"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public void unregisterListener(ListenerKey listenerKey, QueueOperation unregisterOperation) {"
         errorLine2="                                                            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="86"
-            column="61"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    public void onConnected(ServiceConnection connection) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="94"
-            column="29"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    public void onDisconnected(ServiceConnection connection, long reconnectDelayMs) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="99"
-            column="32"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    public boolean handleMessage(Message msg) {"
         errorLine2="                                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"
-            line="110"
-            column="34"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="    public void track(SettableFuture&lt;?> future) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/DefaultExecutionTracker.java"
-            line="39"
-            column="23"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/DefaultExecutionTracker.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public void cancelPendingFutures(Throwable throwable) {"
         errorLine2="                                     ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/DefaultExecutionTracker.java"
-            line="53"
-            column="38"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/DefaultExecutionTracker.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    void track(SettableFuture&lt;?> future);"
         errorLine2="               ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ExecutionTracker.java"
-            line="33"
-            column="16"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ExecutionTracker.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    void cancelPendingFutures(Throwable throwable);"
         errorLine2="                              ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ExecutionTracker.java"
-            line="36"
-            column="31"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ExecutionTracker.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="    public ListenerKey(Object listenerKey) {"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ListenerKey.java"
-            line="32"
-            column="24"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ListenerKey.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="    void execute(IBinder binder) throws RemoteException;"
         errorLine2="                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"
-            line="38"
-            column="18"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="    void setException(Throwable exception);"
         errorLine2="                      ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"
-            line="41"
-            column="23"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="    QueueOperation trackExecution(ExecutionTracker tracker);"
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"
-            line="48"
-            column="5"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="    QueueOperation trackExecution(ExecutionTracker tracker);"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"
-            line="48"
-            column="35"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="    ConnectionConfiguration getConnectionConfiguration();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"
-            line="51"
-            column="5"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="    void execute(S service, SettableFuture&lt;R> resultFuture) throws RemoteException;"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/RemoteFutureOperation.java"
-            line="44"
-            column="29"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/RemoteFutureOperation.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="        void onConnected(ServiceConnection connection);"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java"
-            line="60"
-            column="26"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="        void onDisconnected(ServiceConnection connection, long reconnectDelayMs);"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java"
-            line="68"
-            column="29"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="    void execute(IBinder binder, SettableFuture&lt;R> resultFuture) throws RemoteException;"
         errorLine2="                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/ServiceOperation.java"
-            line="44"
-            column="18"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/ServiceOperation.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="    void execute(IBinder binder, SettableFuture&lt;R> resultFuture) throws RemoteException;"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/platform/client/impl/ipc/ServiceOperation.java"
-            line="44"
-            column="34"/>
+            file="src/main/java/androidx/health/platform/client/impl/ipc/ServiceOperation.java"/>
     </issue>
 
 </issues>
diff --git a/health/health-services-client/lint-baseline.xml b/health/health-services-client/lint-baseline.xml
index 81fa3394..4e47030 100644
--- a/health/health-services-client/lint-baseline.xml
+++ b/health/health-services-client/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="@Keep"
         errorLine2="~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/data/AggregateDataPoints.kt"
-            line="25"
-            column="1"/>
+            file="src/main/java/androidx/health/services/client/data/AggregateDataPoints.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="@Keep"
         errorLine2="~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/data/DataPoints.kt"
-            line="28"
-            column="1"/>
+            file="src/main/java/androidx/health/services/client/data/DataPoints.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    @Keep"
         errorLine2="    ~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/data/DataPoints.kt"
-            line="64"
-            column="5"/>
+            file="src/main/java/androidx/health/services/client/data/DataPoints.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="public data class ExerciseGoalRequest(val packageName: String, val exerciseGoal: ExerciseGoal) :"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/request/ExerciseGoalRequest.kt"
-            line="28"
-            column="19"/>
+            file="src/main/java/androidx/health/services/client/impl/request/ExerciseGoalRequest.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        @Synchronized"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ExerciseUpdateListenerStub.kt"
-            line="74"
-            column="9"/>
+            file="src/main/java/androidx/health/services/client/impl/ExerciseUpdateListenerStub.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        @Synchronized"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ExerciseUpdateListenerStub.kt"
-            line="82"
-            column="9"/>
+            file="src/main/java/androidx/health/services/client/impl/ExerciseUpdateListenerStub.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        @Synchronized"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/health/services/client/impl/MeasureCallbackStub.kt"
-            line="76"
-            column="9"/>
+            file="src/main/java/androidx/health/services/client/impl/MeasureCallbackStub.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        @Synchronized"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/health/services/client/impl/MeasureCallbackStub.kt"
-            line="99"
-            column="9"/>
+            file="src/main/java/androidx/health/services/client/impl/MeasureCallbackStub.kt"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        @Synchronized"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/health/services/client/impl/PassiveMonitoringCallbackStub.kt"
-            line="61"
-            column="9"/>
+            file="src/main/java/androidx/health/services/client/impl/PassiveMonitoringCallbackStub.kt"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        @Synchronized"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/health/services/client/impl/PassiveMonitoringCallbackStub.kt"
-            line="71"
-            column="9"/>
+            file="src/main/java/androidx/health/services/client/impl/PassiveMonitoringCallbackStub.kt"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    private synchronized void handleRetriableDisconnection(Throwable throwable) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ServiceConnection.java"
-            line="155"
-            column="5"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ServiceConnection.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        get() = ServiceBackedMeasureClient.getClient(applicationContext)"
         errorLine2="                                           ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ServiceBackedHealthServicesClient.kt"
-            line="51"
-            column="44"/>
+            file="src/main/java/androidx/health/services/client/impl/ServiceBackedHealthServicesClient.kt"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                        mCurrentVersion ="
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="69"
-            column="25"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                        return mConnectionConfiguration;"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="83"
-            column="32"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                            mConnectionManager.scheduleForExecution("
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="143"
-            column="29"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                                    new BaseQueueOperation(mConnectionConfiguration));"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="144"
-            column="60"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                            mConnectionManager.scheduleForExecution("
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="150"
-            column="29"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                                    createQueueOperation(operation, settableFuture));"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="151"
-            column="37"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                operation.execute(getService(binder), settableFuture);"
         errorLine2="                                  ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="279"
-            column="35"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        private val IDS = initialize()"
         errorLine2="                          ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/data/ExerciseType.kt"
-            line="121"
-            column="27"/>
+            file="src/main/java/androidx/health/services/client/data/ExerciseType.kt"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="            return listeners.getOrPut(listener) { ExerciseUpdateListenerStub(listener, executor) }"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ExerciseUpdateListenerStub.kt"
-            line="79"
-            column="51"/>
+            file="src/main/java/androidx/health/services/client/impl/ExerciseUpdateListenerStub.kt"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="                measureCallbackStub = MeasureCallbackStub(callbackKey, measureCallback)"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/MeasureCallbackStub.kt"
-            line="92"
-            column="39"/>
+            file="src/main/java/androidx/health/services/client/impl/MeasureCallbackStub.kt"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="                PassiveMonitoringCallbackStub(packageName, callback)"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/PassiveMonitoringCallbackStub.kt"
-            line="67"
-            column="17"/>
+            file="src/main/java/androidx/health/services/client/impl/PassiveMonitoringCallbackStub.kt"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="            RemoteFutureOperation&lt;S, R> operation, int minApiVersion) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="130"
-            column="52"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public BaseQueueOperation(ConnectionConfiguration connectionConfiguration) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"
-            line="37"
-            column="31"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public void execute(IBinder binder) throws RemoteException {}"
         errorLine2="                        ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"
-            line="42"
-            column="25"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public void setException(Throwable exception) {}"
         errorLine2="                             ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"
-            line="45"
-            column="30"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public QueueOperation trackExecution(ExecutionTracker tracker) {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"
-            line="48"
-            column="12"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    public QueueOperation trackExecution(ExecutionTracker tracker) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"
-            line="48"
-            column="42"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    public ConnectionConfiguration getConnectionConfiguration() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"
-            line="54"
-            column="12"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/BaseQueueOperation.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="            ClientConfiguration clientConfiguration,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="61"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="            ConnectionManager connectionManager,"
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="62"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="            ServiceGetter&lt;S> serviceGetter,"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="63"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="            RemoteOperation&lt;S, Integer> remoteVersionGetter) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="64"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> execute(RemoteOperation&lt;S, R> operation) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="102"
-            column="19"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> execute(RemoteOperation&lt;S, R> operation) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="102"
-            column="47"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> execute(RemoteFutureOperation&lt;S, R> operation) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="114"
-            column="19"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> execute(RemoteFutureOperation&lt;S, R> operation) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="114"
-            column="47"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> executeWithVersionCheck("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="129"
-            column="19"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="            RemoteFutureOperation&lt;S, R> operation, int minApiVersion) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="130"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    protected ListenableFuture&lt;Integer> getCurrentRemoteVersion(boolean forceRefresh) {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="169"
-            column="15"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> registerListener("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="196"
-            column="19"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteOperation&lt;S, R> registerListenerOperation) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="197"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteOperation&lt;S, R> registerListenerOperation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="197"
-            column="38"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> registerListener("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="217"
-            column="19"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteFutureOperation&lt;S, R> registerListenerOperation) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="218"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteFutureOperation&lt;S, R> registerListenerOperation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="218"
-            column="38"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> unregisterListener("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="235"
-            column="19"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteOperation&lt;S, R> unregisterListenerOperation) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="236"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteOperation&lt;S, R> unregisterListenerOperation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="236"
-            column="38"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    protected &lt;R> ListenableFuture&lt;R> unregisterListener("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="253"
-            column="19"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteFutureOperation&lt;S, R> unregisterListenerOperation) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="254"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="            ListenerKey listenerKey, RemoteFutureOperation&lt;S, R> unregisterListenerOperation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"
-            line="254"
-            column="38"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/Client.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public ClientConfiguration(String apiClientName, String servicePackageName, String bindAction) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"
-            line="34"
-            column="32"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    public ClientConfiguration(String apiClientName, String servicePackageName, String bindAction) {"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"
-            line="34"
-            column="54"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public ClientConfiguration(String apiClientName, String servicePackageName, String bindAction) {"
         errorLine2="                                                                                ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"
-            line="34"
-            column="81"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="    public String getServicePackageName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"
-            line="41"
-            column="12"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="    public String getBindAction() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"
-            line="46"
-            column="12"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="    public String getApiClientName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/ClientConfiguration.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="            String packageName,"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionConfiguration.java"
-            line="37"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionConfiguration.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="            String clientName,"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionConfiguration.java"
-            line="38"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionConfiguration.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="            String bindAction,"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionConfiguration.java"
-            line="39"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionConfiguration.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="            QueueOperation refreshVersionOperation) {"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionConfiguration.java"
-            line="40"
-            column="13"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionConfiguration.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="    public ConnectionManager(Context context, Looper looper) {"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="52"
-            column="30"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="    public ConnectionManager(Context context, Looper looper) {"
         errorLine2="                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="52"
-            column="47"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="    public void scheduleForExecution(QueueOperation operation) {"
         errorLine2="                                     ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="62"
-            column="38"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="    public void registerListener(ListenerKey listenerKey, QueueOperation registerOperation) {"
         errorLine2="                                 ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="73"
-            column="34"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -744,9 +610,7 @@
         errorLine1="    public void registerListener(ListenerKey listenerKey, QueueOperation registerOperation) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="73"
-            column="59"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -755,9 +619,7 @@
         errorLine1="    public void unregisterListener(ListenerKey listenerKey, QueueOperation unregisterOperation) {"
         errorLine2="                                   ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="86"
-            column="36"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -766,9 +628,7 @@
         errorLine1="    public void unregisterListener(ListenerKey listenerKey, QueueOperation unregisterOperation) {"
         errorLine2="                                                            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="86"
-            column="61"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -777,9 +637,7 @@
         errorLine1="    public void onConnected(ServiceConnection connection) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="94"
-            column="29"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -788,9 +646,7 @@
         errorLine1="    public void onDisconnected(ServiceConnection connection, long reconnectDelayMs) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="99"
-            column="32"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -799,9 +655,7 @@
         errorLine1="    public boolean handleMessage(Message msg) {"
         errorLine2="                                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"
-            line="110"
-            column="34"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ConnectionManager.java"/>
     </issue>
 
     <issue
@@ -810,9 +664,7 @@
         errorLine1="    public void track(SettableFuture&lt;?> future) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/DefaultExecutionTracker.java"
-            line="39"
-            column="23"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/DefaultExecutionTracker.java"/>
     </issue>
 
     <issue
@@ -821,9 +673,7 @@
         errorLine1="    public void cancelPendingFutures(Throwable throwable) {"
         errorLine2="                                     ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/DefaultExecutionTracker.java"
-            line="53"
-            column="38"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/DefaultExecutionTracker.java"/>
     </issue>
 
     <issue
@@ -832,9 +682,7 @@
         errorLine1="    void track(SettableFuture&lt;?> future);"
         errorLine2="               ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ExecutionTracker.java"
-            line="33"
-            column="16"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ExecutionTracker.java"/>
     </issue>
 
     <issue
@@ -843,9 +691,7 @@
         errorLine1="    void cancelPendingFutures(Throwable throwable);"
         errorLine2="                              ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ExecutionTracker.java"
-            line="36"
-            column="31"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ExecutionTracker.java"/>
     </issue>
 
     <issue
@@ -854,9 +700,7 @@
         errorLine1="    public ListenerKey(Object listenerKey) {"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ListenerKey.java"
-            line="32"
-            column="24"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ListenerKey.java"/>
     </issue>
 
     <issue
@@ -865,9 +709,7 @@
         errorLine1="    void execute(IBinder binder) throws RemoteException;"
         errorLine2="                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"
-            line="38"
-            column="18"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -876,9 +718,7 @@
         errorLine1="    void setException(Throwable exception);"
         errorLine2="                      ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"
-            line="41"
-            column="23"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -887,9 +727,7 @@
         errorLine1="    QueueOperation trackExecution(ExecutionTracker tracker);"
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"
-            line="48"
-            column="5"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -898,9 +736,7 @@
         errorLine1="    QueueOperation trackExecution(ExecutionTracker tracker);"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"
-            line="48"
-            column="35"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -909,9 +745,7 @@
         errorLine1="    ConnectionConfiguration getConnectionConfiguration();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"
-            line="51"
-            column="5"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/QueueOperation.java"/>
     </issue>
 
     <issue
@@ -920,9 +754,7 @@
         errorLine1="    void execute(S service, SettableFuture&lt;R> resultFuture) throws RemoteException;"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/RemoteFutureOperation.java"
-            line="44"
-            column="29"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/RemoteFutureOperation.java"/>
     </issue>
 
     <issue
@@ -931,9 +763,7 @@
         errorLine1="        void onConnected(ServiceConnection connection);"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ServiceConnection.java"
-            line="61"
-            column="26"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ServiceConnection.java"/>
     </issue>
 
     <issue
@@ -942,9 +772,7 @@
         errorLine1="        void onDisconnected(ServiceConnection connection, long reconnectDelayMs);"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ServiceConnection.java"
-            line="69"
-            column="29"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/internal/ServiceConnection.java"/>
     </issue>
 
     <issue
@@ -953,9 +781,7 @@
         errorLine1="    void execute(IBinder binder, SettableFuture&lt;R> resultFuture) throws RemoteException;"
         errorLine2="                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/ServiceOperation.java"
-            line="44"
-            column="18"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/ServiceOperation.java"/>
     </issue>
 
     <issue
@@ -964,9 +790,7 @@
         errorLine1="    void execute(IBinder binder, SettableFuture&lt;R> resultFuture) throws RemoteException;"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/health/services/client/impl/ipc/ServiceOperation.java"
-            line="44"
-            column="34"/>
+            file="src/main/java/androidx/health/services/client/impl/ipc/ServiceOperation.java"/>
     </issue>
 
 </issues>
diff --git a/heifwriter/heifwriter/lint-baseline.xml b/heifwriter/heifwriter/lint-baseline.xml
index 63374d0..130aafe 100644
--- a/heifwriter/heifwriter/lint-baseline.xml
+++ b/heifwriter/heifwriter/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        synchronized void updateInputEOSTime(long timestampNs) {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/heifwriter/HeifEncoder.java"
-            line="836"
-            column="9"/>
+            file="src/main/java/androidx/heifwriter/HeifEncoder.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        synchronized boolean updateLastInputAndEncoderTime(long inputTimeNs, long encoderTimeUs) {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/heifwriter/HeifEncoder.java"
-            line="851"
-            column="9"/>
+            file="src/main/java/androidx/heifwriter/HeifEncoder.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        synchronized void updateLastOutputTime(long outputTimeUs) {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/heifwriter/HeifEncoder.java"
-            line="864"
-            column="9"/>
+            file="src/main/java/androidx/heifwriter/HeifEncoder.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        synchronized void waitForResult(long timeoutMs) throws Exception {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="666"
-            column="9"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        synchronized void signalResult(@Nullable Exception e) {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="696"
-            column="9"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public static FloatBuffer createFloatBuffer(float[] coords) {"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/EglRectBlt.java"
-            line="59"
-            column="19"/>
+            file="src/main/java/androidx/heifwriter/EglRectBlt.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public static FloatBuffer createFloatBuffer(float[] coords) {"
         errorLine2="                                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/EglRectBlt.java"
-            line="59"
-            column="49"/>
+            file="src/main/java/androidx/heifwriter/EglRectBlt.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public EglRectBlt(Texture2dProgram program, int texWidth, int texHeight) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/EglRectBlt.java"
-            line="75"
-            column="23"/>
+            file="src/main/java/androidx/heifwriter/EglRectBlt.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public void loadTexture(int texId, Bitmap bitmap) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/EglRectBlt.java"
-            line="109"
-            column="40"/>
+            file="src/main/java/androidx/heifwriter/EglRectBlt.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public void copyRect(int textureId, float[] texMatrix, Rect texRect) {"
         errorLine2="                                        ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/EglRectBlt.java"
-            line="116"
-            column="41"/>
+            file="src/main/java/androidx/heifwriter/EglRectBlt.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void copyRect(int textureId, float[] texMatrix, Rect texRect) {"
         errorLine2="                                                           ~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/EglRectBlt.java"
-            line="116"
-            column="60"/>
+            file="src/main/java/androidx/heifwriter/EglRectBlt.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public EglWindowSurface(Surface surface) {"
         errorLine2="                            ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/EglWindowSurface.java"
-            line="54"
-            column="29"/>
+            file="src/main/java/androidx/heifwriter/EglWindowSurface.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public Surface getSurface() {"
         errorLine2="           ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/EglWindowSurface.java"
-            line="191"
-            column="12"/>
+            file="src/main/java/androidx/heifwriter/EglWindowSurface.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        public Builder setRotation(int rotation) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="206"
-            column="16"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="        public Builder setGridEnabled(boolean gridEnabled) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="221"
-            column="16"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="        public Builder setQuality(int quality) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="233"
-            column="16"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        public Builder setMaxImages(int maxImages) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="252"
-            column="16"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        public Builder setPrimaryIndex(int primaryIndex) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="267"
-            column="16"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        public Builder setHandler(@Nullable Handler handler) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="283"
-            column="16"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        public HeifWriter build() throws IOException {"
         errorLine2="               ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/HeifWriter.java"
-            line="295"
-            column="16"/>
+            file="src/main/java/androidx/heifwriter/HeifWriter.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public void loadTexture(int texId, Bitmap bitmap) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"
-            line="204"
-            column="40"/>
+            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public void draw(float[] mvpMatrix, FloatBuffer vertexBuffer, int firstVertex,"
         errorLine2="                     ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"
-            line="225"
-            column="22"/>
+            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public void draw(float[] mvpMatrix, FloatBuffer vertexBuffer, int firstVertex,"
         errorLine2="                                        ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"
-            line="225"
-            column="41"/>
+            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="            float[] texMatrix, FloatBuffer texBuffer, int textureId, int texStride) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"
-            line="227"
-            column="13"/>
+            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="            float[] texMatrix, FloatBuffer texBuffer, int textureId, int texStride) {"
         errorLine2="                               ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"
-            line="227"
-            column="32"/>
+            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public static int createProgram(String vertexSource, String fragmentSource) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"
-            line="280"
-            column="37"/>
+            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public static int createProgram(String vertexSource, String fragmentSource) {"
         errorLine2="                                                         ~~~~~~">
         <location
-            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"
-            line="280"
-            column="58"/>
+            file="src/main/java/androidx/heifwriter/Texture2dProgram.java"/>
     </issue>
 
     <issue
diff --git a/leanback/leanback-preference/lint-baseline.xml b/leanback/leanback-preference/lint-baseline.xml
index a7f5251..1cb94e7 100644
--- a/leanback/leanback-preference/lint-baseline.xml
+++ b/leanback/leanback-preference/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="&lt;manifest />"
         errorLine2=" ~~~~~~~~">
         <location
-            file="src/main/AndroidManifest.xml"
-            line="18"
-            column="2"/>
+            file="src/main/AndroidManifest.xml"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="&lt;manifest />"
         errorLine2=" ~~~~~~~~">
         <location
-            file="src/main/AndroidManifest.xml"
-            line="18"
-            column="2"/>
+            file="src/main/AndroidManifest.xml"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="&lt;manifest />"
         errorLine2=" ~~~~~~~~">
         <location
-            file="src/main/AndroidManifest.xml"
-            line="18"
-            column="2"/>
+            file="src/main/AndroidManifest.xml"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"
-            line="71"
-            column="12"/>
+            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,"
         errorLine2="                                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"
-            line="71"
-            column="46"/>
+            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,"
         errorLine2="                                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"
-            line="71"
-            column="71"/>
+            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"
-            line="72"
-            column="13"/>
+            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public Fragment getCallbackFragment() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"
-            line="87"
-            column="12"/>
+            file="src/main/java/androidx/leanback/preference/BaseLeanbackPreferenceFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public static LeanbackEditTextPreferenceDialogFragmentCompat newInstance(String key) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"
-            line="67"
-            column="19"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public static LeanbackEditTextPreferenceDialogFragmentCompat newInstance(String key) {"
         errorLine2="                                                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"
-            line="67"
-            column="78"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"
-            line="79"
-            column="26"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"
-            line="115"
-            column="12"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                               ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"
-            line="115"
-            column="64"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"
-            line="116"
-            column="13"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackEditTextPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public static LeanbackListPreferenceDialogFragmentCompat newInstanceSingle(String key) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="73"
-            column="19"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public static LeanbackListPreferenceDialogFragmentCompat newInstanceSingle(String key) {"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="73"
-            column="80"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public static LeanbackListPreferenceDialogFragmentCompat newInstanceMulti(String key) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="89"
-            column="19"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public static LeanbackListPreferenceDialogFragmentCompat newInstanceMulti(String key) {"
         errorLine2="                                                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="89"
-            column="79"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="101"
-            column="26"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="160"
-            column="12"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                               ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="160"
-            column="64"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="161"
-            column="13"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="        public Checkable getWidgetView() {"
         errorLine2="               ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="351"
-            column="16"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="        public TextView getTitleView() {"
         errorLine2="               ~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="355"
-            column="16"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="        public ViewGroup getContainer() {"
         errorLine2="               ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"
-            line="359"
-            column="16"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackPreferenceDialogFragmentCompat.java"
-            line="39"
-            column="26"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public DialogPreference getPreference() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/preference/LeanbackPreferenceDialogFragmentCompat.java"
-            line="53"
-            column="12"/>
+            file="src/main/java/androidx/leanback/preference/LeanbackPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
diff --git a/leanback/leanback/lint-baseline.xml b/leanback/leanback/lint-baseline.xml
index e6887b0..d652e60 100644
--- a/leanback/leanback/lint-baseline.xml
+++ b/leanback/leanback/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            mGridView.setLayoutMode(ViewGroup.LAYOUT_MODE_OPTICAL_BOUNDS);"
         errorLine2="                      ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/leanback/widget/GridActivity.java"
-            line="130"
-            column="23"/>
+            file="src/androidTest/java/androidx/leanback/widget/GridActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                viewGroup.setLayoutMode(ViewGroup.LAYOUT_MODE_OPTICAL_BOUNDS);"
         errorLine2="                          ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/leanback/widget/GridActivity.java"
-            line="461"
-            column="27"/>
+            file="src/androidTest/java/androidx/leanback/widget/GridActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                    getActivity().enterPictureInPictureMode();"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/leanback/app/PlaybackTestFragment.java"
-            line="104"
-            column="35"/>
+            file="src/androidTest/java/androidx/leanback/app/PlaybackTestFragment.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    getActivity().enterPictureInPictureMode();"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/leanback/app/PlaybackTestSupportFragment.java"
-            line="101"
-            column="35"/>
+            file="src/androidTest/java/androidx/leanback/app/PlaybackTestSupportFragment.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            if (!Objects.equals(mPreviousQuery, newQuery)) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/leanback/app/SearchFragmentTest.java"
-            line="245"
-            column="26"/>
+            file="src/androidTest/java/androidx/leanback/app/SearchFragmentTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            if (!Objects.equals(mPreviousQuery, query)) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/leanback/app/SearchFragmentTest.java"
-            line="256"
-            column="26"/>
+            file="src/androidTest/java/androidx/leanback/app/SearchFragmentTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            if (!Objects.equals(mPreviousQuery, newQuery)) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/leanback/app/SearchSupportFragmentTest.java"
-            line="242"
-            column="26"/>
+            file="src/androidTest/java/androidx/leanback/app/SearchSupportFragmentTest.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            if (!Objects.equals(mPreviousQuery, query)) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/androidTest/java/androidx/leanback/app/SearchSupportFragmentTest.java"
-            line="253"
-            column="26"/>
+            file="src/androidTest/java/androidx/leanback/app/SearchSupportFragmentTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                mPlaybackSpeed = -PLAYBACK_SPEED_FAST_L0;"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/media/PlaybackBannerControlGlue.java"
-            line="431"
-            column="34"/>
+            file="src/main/java/androidx/leanback/media/PlaybackBannerControlGlue.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                drawable.setAlpha(view.getBackground().getAlpha());"
         errorLine2="                                                       ~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/BackgroundHelper.java"
-            line="35"
-            column="56"/>
+            file="src/main/java/androidx/leanback/widget/BackgroundHelper.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            yearPattern = android.text.format.DateFormat.getBestDateTimePattern(mConstant.locale,"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/picker/DatePicker.java"
-            line="144"
-            column="58"/>
+            file="src/main/java/androidx/leanback/widget/picker/DatePicker.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="            return view.getForeground();"
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/ForegroundHelper.java"
-            line="17"
-            column="25"/>
+            file="src/main/java/androidx/leanback/widget/ForegroundHelper.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="            view.setForeground(drawable);"
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/ForegroundHelper.java"
-            line="25"
-            column="18"/>
+            file="src/main/java/androidx/leanback/widget/ForegroundHelper.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="            return fragment.getContext();"
         errorLine2="                            ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/app/FragmentUtil.java"
-            line="25"
-            column="29"/>
+            file="src/main/java/androidx/leanback/app/FragmentUtil.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                    vh.mTitleView.setAutofillHints(action.getAutofillHints());"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"
-            line="698"
-            column="35"/>
+            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                    vh.mTitleView.setAutofillHints((String[]) null);"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"
-            line="700"
-            column="35"/>
+            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                vh.mTitleView.setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"
-            line="704"
-            column="31"/>
+            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                    vh.mDescriptionView.setAutofillHints(action.getAutofillHints());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"
-            line="719"
-            column="41"/>
+            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                    vh.mDescriptionView.setAutofillHints((String[]) null);"
         errorLine2="                                        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"
-            line="721"
-            column="41"/>
+            file="src/main/java/androidx/leanback/widget/GuidedActionsStylist.java"/>
     </issue>
 
     <issue
diff --git a/lifecycle/integration-tests/testapp/lint-baseline.xml b/lifecycle/integration-tests/testapp/lint-baseline.xml
index 5fb92ac..34db726 100644
--- a/lifecycle/integration-tests/testapp/lint-baseline.xml
+++ b/lifecycle/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    List&lt;Pair&lt;TestEvent, Lifecycle.Event>> copyCollectedEvents();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingLifecycleOwner.java"
-            line="36"
-            column="5"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingLifecycleOwner.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportActivity.java"
-            line="46"
-            column="29"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public void replaceFragment(Fragment fragment) {"
         errorLine2="                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportActivity.java"
-            line="58"
-            column="33"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportActivity.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public List&lt;Pair&lt;TestEvent, Event>> copyCollectedEvents() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportActivity.java"
-            line="98"
-            column="12"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportActivity.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    protected void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportActivity.java"
-            line="103"
-            column="40"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportActivity.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportFragment.java"
-            line="46"
-            column="26"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportFragment.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,"
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportFragment.java"
-            line="54"
-            column="30"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportFragment.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public void replaceFragment(Fragment fragment) {"
         errorLine2="                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportFragment.java"
-            line="65"
-            column="33"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportFragment.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public List&lt;Pair&lt;TestEvent, Lifecycle.Event>> copyCollectedEvents() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportFragment.java"
-            line="103"
-            column="12"/>
+            file="src/main/java/androidx/lifecycle/testapp/CollectingSupportFragment.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/FrameworkLifecycleRegistryActivity.java"
-            line="54"
-            column="29"/>
+            file="src/main/java/androidx/lifecycle/testapp/FrameworkLifecycleRegistryActivity.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public List&lt;Pair&lt;TestEvent, Lifecycle.Event>> copyCollectedEvents() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/FrameworkLifecycleRegistryActivity.java"
-            line="92"
-            column="12"/>
+            file="src/main/java/androidx/lifecycle/testapp/FrameworkLifecycleRegistryActivity.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/LifecycleTestActivity.java"
-            line="34"
-            column="29"/>
+            file="src/main/java/androidx/lifecycle/testapp/LifecycleTestActivity.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/SimpleAppLifecycleTestActivity.java"
-            line="82"
-            column="29"/>
+            file="src/main/java/androidx/lifecycle/testapp/SimpleAppLifecycleTestActivity.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public static List&lt;Pair&lt;TestEventType, Lifecycle.Event>> awaitForEvents()"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/SimpleAppLifecycleTestActivity.java"
-            line="96"
-            column="19"/>
+            file="src/main/java/androidx/lifecycle/testapp/SimpleAppLifecycleTestActivity.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/UsualFragment.java"
-            line="34"
-            column="30"/>
+            file="src/main/java/androidx/lifecycle/testapp/UsualFragment.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/UsualFragment.java"
-            line="34"
-            column="55"/>
+            file="src/main/java/androidx/lifecycle/testapp/UsualFragment.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/testapp/UsualFragment.java"
-            line="35"
-            column="13"/>
+            file="src/main/java/androidx/lifecycle/testapp/UsualFragment.java"/>
     </issue>
 
 </issues>
diff --git a/lifecycle/lifecycle-common/lint-baseline.xml b/lifecycle/lifecycle-common/lint-baseline.xml
index 46369e4..3fd3fa1 100644
--- a/lifecycle/lifecycle-common/lint-baseline.xml
+++ b/lifecycle/lifecycle-common/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                        mMethod.invoke(target);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/ClassesInfoCache.java"
-            line="222"
-            column="25"/>
+            file="src/main/java/androidx/lifecycle/ClassesInfoCache.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                        mMethod.invoke(target, source);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/ClassesInfoCache.java"
-            line="225"
-            column="25"/>
+            file="src/main/java/androidx/lifecycle/ClassesInfoCache.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                        mMethod.invoke(target, source, event);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/ClassesInfoCache.java"
-            line="228"
-            column="25"/>
+            file="src/main/java/androidx/lifecycle/ClassesInfoCache.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            MethodCallsLogger logger);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/GeneratedAdapter.java"
-            line="37"
-            column="13"/>
+            file="src/main/java/androidx/lifecycle/GeneratedAdapter.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    void onStateChanged(@NonNull LifecycleOwner source, @NonNull Lifecycle.Event event);"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/LifecycleEventObserver.java"
-            line="39"
-            column="57"/>
+            file="src/main/java/androidx/lifecycle/LifecycleEventObserver.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    void callMethods(LifecycleOwner source, Lifecycle.Event event, boolean onAny,"
         errorLine2="                     ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/GeneratedAdapter.java"
-            line="36"
-            column="22"/>
+            file="src/main/java/androidx/lifecycle/GeneratedAdapter.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    void callMethods(LifecycleOwner source, Lifecycle.Event event, boolean onAny,"
         errorLine2="                                            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/GeneratedAdapter.java"
-            line="36"
-            column="45"/>
+            file="src/main/java/androidx/lifecycle/GeneratedAdapter.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            MethodCallsLogger logger);"
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/GeneratedAdapter.java"
-            line="37"
-            column="13"/>
+            file="src/main/java/androidx/lifecycle/GeneratedAdapter.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public static String getAdapterName(String className) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/Lifecycling.java"
-            line="208"
-            column="19"/>
+            file="src/main/java/androidx/lifecycle/Lifecycling.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public static String getAdapterName(String className) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/Lifecycling.java"
-            line="208"
-            column="41"/>
+            file="src/main/java/androidx/lifecycle/Lifecycling.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public boolean approveCall(String name, int type) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/MethodCallsLogger.java"
-            line="35"
-            column="32"/>
+            file="src/main/java/androidx/lifecycle/MethodCallsLogger.java"/>
     </issue>
 
 </issues>
diff --git a/lifecycle/lifecycle-extensions/lint-baseline.xml b/lifecycle/lifecycle-extensions/lint-baseline.xml
index 772af1c..66028fd 100644
--- a/lifecycle/lifecycle-extensions/lint-baseline.xml
+++ b/lifecycle/lifecycle-extensions/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="public class ViewModelProviders {"
         errorLine2="             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/ViewModelProviders.java"
-            line="33"
-            column="14"/>
+            file="src/main/java/androidx/lifecycle/ViewModelProviders.java"/>
     </issue>
 
 </issues>
diff --git a/lifecycle/lifecycle-reactivestreams/lint-baseline.xml b/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
index f339525..ff4e6d2 100644
--- a/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
+++ b/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            @NonNull LifecycleOwner lifecycle, @NonNull LiveData&lt;T> liveData) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.java"
-            line="55"
-            column="48"/>
+            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.java"/>
     </issue>
 
 </issues>
diff --git a/lint-checks/lint-baseline.xml b/lint-checks/lint-baseline.xml
index 77bb012..69e3984 100644
--- a/lint-checks/lint-baseline.xml
+++ b/lint-checks/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="import java.util.concurrent.ConcurrentHashMap;"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="integration-tests/src/main/java/androidx/ConcurrentHashMapUsageJava.java"
-            line="22"
-            column="1"/>
+            file="integration-tests/src/main/java/androidx/ConcurrentHashMapUsageJava.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="import java.util.concurrent.ConcurrentHashMap"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="integration-tests/src/main/java/androidx/ConcurrentHashMapUsageKotlin.kt"
-            line="19"
-            column="1"/>
+            file="integration-tests/src/main/java/androidx/ConcurrentHashMapUsageKotlin.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="import java.util.concurrent.ConcurrentHashMap;"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="integration-tests/src/main/java/androidx/Sample.java"
-            line="19"
-            column="1"/>
+            file="integration-tests/src/main/java/androidx/Sample.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public synchronized void someMethod() {"
         errorLine2="    ^">
         <location
-            file="integration-tests/src/main/java/androidx/SynchronizedMethodJava.java"
-            line="22"
-            column="5"/>
+            file="integration-tests/src/main/java/androidx/SynchronizedMethodJava.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    @Synchronized"
         errorLine2="    ^">
         <location
-            file="integration-tests/src/main/java/androidx/SynchronizedMethodKotlin.kt"
-            line="22"
-            column="5"/>
+            file="integration-tests/src/main/java/androidx/SynchronizedMethodKotlin.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        //noinspection deprecation"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="integration-tests/src/main/java/androidx/IdeaSuppressionJava.java"
-            line="29"
-            column="9"/>
+            file="integration-tests/src/main/java/androidx/IdeaSuppressionJava.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        //noinspection deprecation"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="integration-tests/src/main/java/androidx/IdeaSuppressionKotlin.kt"
-            line="27"
-            column="9"/>
+            file="integration-tests/src/main/java/androidx/IdeaSuppressionKotlin.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    static class DefaultInnerClass {"
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="integration-tests/src/main/java/androidx/PrivateConstructorForUtilityClassJava.java"
-            line="37"
-            column="18"/>
+            file="integration-tests/src/main/java/androidx/PrivateConstructorForUtilityClassJava.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    protected static class ProtectedInnerClass {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="integration-tests/src/main/java/androidx/PrivateConstructorForUtilityClassJava.java"
-            line="46"
-            column="28"/>
+            file="integration-tests/src/main/java/androidx/PrivateConstructorForUtilityClassJava.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public static class PublicInnerClass {"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
-            file="integration-tests/src/main/java/androidx/PrivateConstructorForUtilityClassJava.java"
-            line="55"
-            column="25"/>
+            file="integration-tests/src/main/java/androidx/PrivateConstructorForUtilityClassJava.java"/>
     </issue>
 
 </issues>
diff --git a/lint-demos/lint-demo-appcompat/lint-baseline.xml b/lint-demos/lint-demo-appcompat/lint-baseline.xml
index 75563e0..a4b89aa 100644
--- a/lint-demos/lint-demo-appcompat/lint-baseline.xml
+++ b/lint-demos/lint-demo-appcompat/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            noop.setCompoundDrawableTintList(csl);"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"
-            line="63"
-            column="18"/>
+            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            noop.setCompoundDrawableTintMode(PorterDuff.Mode.DST);"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"
-            line="64"
-            column="18"/>
+            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            setActionBar(new Toolbar(this));"
         errorLine2="            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"
-            line="73"
-            column="13"/>
+            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            setActionBar(new Toolbar(this));"
         errorLine2="                         ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"
-            line="73"
-            column="26"/>
+            file="src/main/java/com/example/android/appcompat/AppCompatLintDemo.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            setActionBar(new Toolbar(this));"
         errorLine2="            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/appcompat/AppCompatLintDemoExt.java"
-            line="33"
-            column="13"/>
+            file="src/main/java/com/example/android/appcompat/AppCompatLintDemoExt.java"/>
     </issue>
 
     <issue
@@ -63,7 +53,6 @@
         errorLine2="                         ~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/appcompat/AppCompatLintDemoExt.java"
-            line="33"
             column="26"/>
     </issue>
 
diff --git a/media/media/lint-baseline.xml b/media/media/lint-baseline.xml
index 112eeb6..3db7c43f 100644
--- a/media/media/lint-baseline.xml
+++ b/media/media/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                @NonNull OnAudioFocusChangeListener listener, @NonNull Handler handler) {"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioFocusRequestCompat.java"
-            line="306"
-            column="63"/>
+            file="src/main/java/androidx/media/AudioFocusRequestCompat.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public AudioAttributesImpl mImpl;"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioAttributesCompat.java"
-            line="242"
-            column="12"/>
+            file="src/main/java/androidx/media/AudioAttributesCompat.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        public Builder(AudioAttributesCompat aa) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioAttributesCompat.java"
-            line="390"
-            column="24"/>
+            file="src/main/java/androidx/media/AudioAttributesCompat.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        public AudioAttributesCompat build() {"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioAttributesCompat.java"
-            line="408"
-            column="16"/>
+            file="src/main/java/androidx/media/AudioAttributesCompat.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        public Builder setUsage(@AttributeUsage int usage) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioAttributesCompat.java"
-            line="434"
-            column="16"/>
+            file="src/main/java/androidx/media/AudioAttributesCompat.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        public Builder setContentType(@AttributeContentType int contentType) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioAttributesCompat.java"
-            line="451"
-            column="16"/>
+            file="src/main/java/androidx/media/AudioAttributesCompat.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        public Builder setFlags(int flags) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioAttributesCompat.java"
-            line="465"
-            column="16"/>
+            file="src/main/java/androidx/media/AudioAttributesCompat.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        public Builder setLegacyStreamType(int streamType) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioAttributesCompat.java"
-            line="485"
-            column="16"/>
+            file="src/main/java/androidx/media/AudioAttributesCompat.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public AudioAttributes mAudioAttributes;"
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioAttributesImplApi21.java"
-            line="42"
-            column="12"/>
+            file="src/main/java/androidx/media/AudioAttributesImplApi21.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        public AudioFocusRequestCompat build() {"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media/AudioFocusRequestCompat.java"
-            line="366"
-            column="16"/>
+            file="src/main/java/androidx/media/AudioFocusRequestCompat.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public MediaBrowserCompat(Context context, ComponentName serviceComponent,"
         errorLine2="                              ~~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="203"
-            column="31"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public MediaBrowserCompat(Context context, ComponentName serviceComponent,"
         errorLine2="                                               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="203"
-            column="48"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="            ConnectionCallback callback, Bundle rootHints) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="204"
-            column="13"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="            ConnectionCallback callback, Bundle rootHints) {"
         errorLine2="                                         ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="204"
-            column="42"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public void search(@NonNull final String query, final Bundle extras,"
         errorLine2="                                                          ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="423"
-            column="59"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public void sendCustomAction(@NonNull String action, Bundle extras,"
         errorLine2="                                                         ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="445"
-            column="58"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        public static MediaItem fromMediaItem(Object itemObj) {"
         errorLine2="                      ~~~~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="507"
-            column="23"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        public static MediaItem fromMediaItem(Object itemObj) {"
         errorLine2="                                              ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="507"
-            column="47"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        public static List&lt;MediaItem> fromMediaItemList(List&lt;?> itemList) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="528"
-            column="23"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        public static List&lt;MediaItem> fromMediaItemList(List&lt;?> itemList) {"
         errorLine2="                                                        ~~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="528"
-            column="57"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="        public void writeToParcel(Parcel out, int flags) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="570"
-            column="35"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="        public void onItemLoaded(MediaItem item) {"
         errorLine2="                                 ~~~~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="896"
-            column="34"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="        public void onSearchResult(@NonNull String query, Bundle extras,"
         errorLine2="                                                          ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="935"
-            column="59"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="        public void onError(@NonNull String query, Bundle extras) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="946"
-            column="52"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="        public void onProgressUpdate(String action, Bundle extras, Bundle data) {"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="962"
-            column="38"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="        public void onProgressUpdate(String action, Bundle extras, Bundle data) {"
         errorLine2="                                                    ~~~~~~">
         <location
-            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"
-            line="962"
-            column="53"/>
+            file="src/main/java/android/support/v4/media/MediaBrowserCompat.java"/>
     </issue>
 
     <issue
diff --git a/media/version-compat-tests/current/service/lint-baseline.xml b/media/version-compat-tests/current/service/lint-baseline.xml
index 4d33183..48673c2 100644
--- a/media/version-compat-tests/current/service/lint-baseline.xml
+++ b/media/version-compat-tests/current/service/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void registersCallback_byController_notifiesOnCallbackRegistered()"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatRegistrationCallbackTest.java"
-            line="78"
-            column="17"/>
+            file="src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatRegistrationCallbackTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void unregistersCallback_byController_notifiesOnCallbackUnregistered()"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatRegistrationCallbackTest.java"
-            line="106"
-            column="17"/>
+            file="src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatRegistrationCallbackTest.java"/>
     </issue>
 
 </issues>
diff --git a/media/version-compat-tests/lib/lint-baseline.xml b/media/version-compat-tests/lib/lint-baseline.xml
index e7c9556..0a1ee53 100644
--- a/media/version-compat-tests/lib/lint-baseline.xml
+++ b/media/version-compat-tests/lib/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void writeToParcel(Parcel dest, int flags) {"
         errorLine2="                              ~~~~~~">
         <location
-            file="src/main/java/androidx/media/test/lib/CustomParcelable.java"
-            line="41"
-            column="31"/>
+            file="src/main/java/androidx/media/test/lib/CustomParcelable.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public static void callMediaBrowserServiceMethod(int methodId, Object arg, Context context) {"
         errorLine2="                                                                   ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="57"
-            column="68"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public static void callMediaBrowserServiceMethod(int methodId, Object arg, Context context) {"
         errorLine2="                                                                               ~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="57"
-            column="80"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public static void callMediaSessionMethod(int methodId, Object arg, Context context) {"
         errorLine2="                                                            ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="69"
-            column="61"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public static void callMediaSessionMethod(int methodId, Object arg, Context context) {"
         errorLine2="                                                                        ~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="69"
-            column="73"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="82"
-            column="27"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="82"
-            column="39"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="82"
-            column="56"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="96"
-            column="27"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="96"
-            column="39"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            int methodId, Object arg, Context context, Parcelable token) {"
         errorLine2="                                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"
-            line="96"
-            column="56"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/IntentUtil.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public static void waitFor(final PollingCheckCondition condition) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java"
-            line="76"
-            column="38"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public static void waitFor(long timeout, final PollingCheckCondition condition) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java"
-            line="90"
-            column="52"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public static void assertBundleEquals(Bundle expected, Bundle observed) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/TestUtil.java"
-            line="32"
-            column="43"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/TestUtil.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public static void assertBundleEquals(Bundle expected, Bundle observed) {"
         errorLine2="                                                           ~~~~~~">
         <location
-            file="src/main/java/android/support/mediacompat/testlib/util/TestUtil.java"
-            line="32"
-            column="60"/>
+            file="src/main/java/android/support/mediacompat/testlib/util/TestUtil.java"/>
     </issue>
 
 </issues>
diff --git a/media2/integration-tests/testapp/lint-baseline.xml b/media2/integration-tests/testapp/lint-baseline.xml
index c4694b9..7e0f108 100644
--- a/media2/integration-tests/testapp/lint-baseline.xml
+++ b/media2/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE)"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="85"
-            column="17"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                requestPermissions(new String[] {Manifest.permission.READ_EXTERNAL_STORAGE},"
         errorLine2="                ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="89"
-            column="17"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            showErrorDialogIfFailed(controller.setMediaItem(mUri.toString()),"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoPlayerActivity.java"
-            line="334"
-            column="13"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoPlayerActivity.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            showErrorDialogIfFailed(controller.prepare(), &quot;failed to prepare &quot; + mUri);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoPlayerActivity.java"
-            line="336"
-            column="13"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoPlayerActivity.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                Intent launch = createLaunchIntent("
         errorLine2="                                ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="99"
-            column="33"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                        mUrlText.getText().toString());"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="101"
-            column="25"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            if ((position >= 0) &amp;&amp; (position &lt; mSelectItems.getCount())) {"
         errorLine2="                                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="203"
-            column="48"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                VideoItem item = mSelectItems.getItem(position);"
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="204"
-            column="34"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                    Intent launch = createLaunchIntent("
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="208"
-            column="37"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        VideoItemList retVal = new VideoItemList(p, is_root);"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="250"
-            column="32"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            return createVil(mPath);"
         errorLine2="                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="314"
-            column="20"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="                mSelectItems = items;"
         errorLine2="                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="320"
-            column="17"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                mSelectList.setAdapter(mSelectItems);"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="321"
-            column="40"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                mSelectList.setAdapter(mSelectItems);"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="321"
-            column="17"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="            mMediaPlayer.reset();"
         errorLine2="            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSessionService.java"
-            line="144"
-            column="13"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSessionService.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="            showToastIfFailed(mMediaPlayer.setAudioAttributes(mAudioAttributes),"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSessionService.java"
-            line="145"
-            column="63"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSessionService.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="            showToastIfFailed(mMediaPlayer.setAudioAttributes(mAudioAttributes),"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSessionService.java"
-            line="145"
-            column="31"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSessionService.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoPlayerActivity.java"
-            line="84"
-            column="26"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoPlayerActivity.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="70"
-            column="26"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] results) {"
         errorLine2="                                                            ~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="121"
-            column="61"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] results) {"
         errorLine2="                                                                                  ~~~~~">
         <location
-            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"
-            line="121"
-            column="83"/>
+            file="src/main/java/androidx/media2/integration/testapp/VideoSelectorActivity.java"/>
     </issue>
 
 </issues>
diff --git a/media2/media2-common/lint-baseline.xml b/media2/media2-common/lint-baseline.xml
index 3c9d381..b2a8847 100644
--- a/media2/media2-common/lint-baseline.xml
+++ b/media2/media2-common/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public abstract MediaItem getCurrentMediaItem();"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/common/SessionPlayer.java"
-            line="819"
-            column="31"/>
+            file="src/main/java/androidx/media2/common/SessionPlayer.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            Executor executor, OnMetadataChangedListener listener) {"
         errorLine2="            ~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/common/MediaItem.java"
-            line="231"
-            column="13"/>
+            file="src/main/java/androidx/media2/common/MediaItem.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            Executor executor, OnMetadataChangedListener listener) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/common/MediaItem.java"
-            line="231"
-            column="32"/>
+            file="src/main/java/androidx/media2/common/MediaItem.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public void removeOnMetadataChangedListener(OnMetadataChangedListener listener) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/common/MediaItem.java"
-            line="246"
-            column="49"/>
+            file="src/main/java/androidx/media2/common/MediaItem.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void writeToParcel(Parcel dest, int flags) {"
         errorLine2="                              ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/common/ParcelImplListSlice.java"
-            line="133"
-            column="31"/>
+            file="src/main/java/androidx/media2/common/ParcelImplListSlice.java"/>
     </issue>
 
 </issues>
diff --git a/media2/media2-player/lint-baseline.xml b/media2/media2-player/lint-baseline.xml
index e0dfd55..b5478ee 100644
--- a/media2/media2-player/lint-baseline.xml
+++ b/media2/media2-player/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                mActivity.setTurnScreenOn(true);"
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/player/MediaPlayer2DrmTestBase.java"
-            line="111"
-            column="27"/>
+            file="src/androidTest/java/androidx/media2/player/MediaPlayer2DrmTestBase.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                mActivity.setShowWhenLocked(true);"
         errorLine2="                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/player/MediaPlayer2DrmTestBase.java"
-            line="112"
-            column="27"/>
+            file="src/androidTest/java/androidx/media2/player/MediaPlayer2DrmTestBase.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                mKeyguardManager.requestDismissKeyguard(mActivity, null);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/player/MediaPlayer2DrmTestBase.java"
-            line="113"
-            column="34"/>
+            file="src/androidTest/java/androidx/media2/player/MediaPlayer2DrmTestBase.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        if (0 == getKeyIds(keyRequest.getData(), keyIds)) {"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/player/MediaPlayer2DrmTestBase.java"
-            line="874"
-            column="39"/>
+            file="src/androidTest/java/androidx/media2/player/MediaPlayer2DrmTestBase.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                mActivity.setTurnScreenOn(true);"
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/player/MediaPlayerDrmTest.java"
-            line="129"
-            column="27"/>
+            file="src/androidTest/java/androidx/media2/player/MediaPlayerDrmTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                mActivity.setShowWhenLocked(true);"
         errorLine2="                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/player/MediaPlayerDrmTest.java"
-            line="130"
-            column="27"/>
+            file="src/androidTest/java/androidx/media2/player/MediaPlayerDrmTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                mKeyguardManager.requestDismissKeyguard(mActivity, null);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/player/MediaPlayerDrmTest.java"
-            line="131"
-            column="34"/>
+            file="src/androidTest/java/androidx/media2/player/MediaPlayerDrmTest.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        if (0 == getKeyIds(keyRequest.getData(), keyIds)) {"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/player/MediaPlayerDrmTest.java"
-            line="955"
-            column="39"/>
+            file="src/androidTest/java/androidx/media2/player/MediaPlayerDrmTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            return super.getResultCode();"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/MediaPlayer.java"
-            line="3859"
-            column="20"/>
+            file="src/main/java/androidx/media2/player/MediaPlayer.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/media2/player/TextRenderer.java"
-            line="132"
-            column="5"/>
+            file="src/main/java/androidx/media2/player/TextRenderer.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/media2/player/TextRenderer.java"
-            line="137"
-            column="5"/>
+            file="src/main/java/androidx/media2/player/TextRenderer.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    /** Clears any previous selection. */"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/media2/player/TextRenderer.java"
-            line="224"
-            column="5"/>
+            file="src/main/java/androidx/media2/player/TextRenderer.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         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"/>
+            file="src/main/java/androidx/media2/player/TextRenderer.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="            return (FileDescriptor) method.invoke(object, fileDescriptor);"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"
-            line="102"
-            column="37"/>
+            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="            method.invoke(object, fileDescriptor, position, /* whence= */ SEEK_SET);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"
-            line="127"
-            column="13"/>
+            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="            return (FileDescriptor) method.invoke(object, fileDescriptor);"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"
-            line="152"
-            column="37"/>
+            file="src/main/java/androidx/media2/player/FileDescriptorUtil.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        void onPrepared(MediaItem mediaItem);"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="92"
-            column="25"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        void onBufferingStarted(MediaItem mediaItem);"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="101"
-            column="33"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        void onBufferingEnded(MediaItem mediaItem);"
         errorLine2="                              ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="104"
-            column="31"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        void onBufferingUpdate(MediaItem mediaItem, int bufferingPercentage);"
         errorLine2="                               ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="107"
-            column="32"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="        void onBandwidthSample(MediaItem mediaItem2, int bitrateKbps);"
         errorLine2="                               ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="110"
-            column="32"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="        void onVideoRenderingStart(MediaItem mediaItem);"
         errorLine2="                                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="113"
-            column="36"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="        void onVideoSizeChanged(MediaItem mediaItem, int width, int height);"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="116"
-            column="33"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="        void onTimedMetadata(MediaItem mediaItem, TimedMetaData timedMetaData);"
         errorLine2="                             ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="123"
-            column="30"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="        void onTimedMetadata(MediaItem mediaItem, TimedMetaData timedMetaData);"
         errorLine2="                                                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="123"
-            column="51"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="        void onMediaItemStartedAsNext(MediaItem mediaItem);"
         errorLine2="                                      ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="126"
-            column="39"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="        void onMediaItemEnded(MediaItem mediaItem);"
         errorLine2="                              ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="129"
-            column="31"/>
+            file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"/>
     </issue>
 
     <issue
@@ -305,7 +251,6 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="src/main/java/androidx/media2/player/ExoPlayerWrapper.java"
-            line="132"
             column="21"/>
     </issue>
 
diff --git a/media2/media2-session/lint-baseline.xml b/media2/media2-session/lint-baseline.xml
index 0d7f46b..06676bf 100644
--- a/media2/media2-session/lint-baseline.xml
+++ b/media2/media2-session/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        return new VolumeProviderCompat(player.getVolumeControlType(), player.getMaxVolume(),"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaSessionLegacyStub.java"
-            line="630"
-            column="41"/>
+            file="src/main/java/androidx/media2/session/MediaSessionLegacyStub.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        return new SessionResult(result.getResultCode(), null, result.getMediaItem(),"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/SessionResult.java"
-            line="134"
-            column="34"/>
+            file="src/main/java/androidx/media2/session/SessionResult.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public void setTimeDiff(Long timeDiff) {"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaController.java"
-            line="1399"
-            column="29"/>
+            file="src/main/java/androidx/media2/session/MediaController.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public IBinder onBind(@NonNull Intent intent) {"
         errorLine2="           ~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaLibraryService.java"
-            line="505"
-            column="12"/>
+            file="src/main/java/androidx/media2/session/MediaLibraryService.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public MediaSessionCompat getSessionCompat() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaSession.java"
-            line="420"
-            column="12"/>
+            file="src/main/java/androidx/media2/session/MediaSession.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public static MediaItem convertToMediaItem(MediaBrowserCompat.MediaItem item) {"
         errorLine2="                  ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="286"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public static MediaItem convertToMediaItem(MediaBrowserCompat.MediaItem item) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="286"
-            column="48"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public static MediaItem convertToMediaItem(QueueItem item) {"
         errorLine2="                  ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="300"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public static MediaItem convertToMediaItem(QueueItem item) {"
         errorLine2="                                               ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="300"
-            column="48"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public static List&lt;MediaItem> convertMediaItemListToMediaItemList("
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="368"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            List&lt;MediaBrowserCompat.MediaItem> items) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="369"
-            column="13"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public static List&lt;MediaItem> convertQueueItemListToMediaItemList(List&lt;QueueItem> items) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="383"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public static List&lt;MediaItem> convertQueueItemListToMediaItemList(List&lt;QueueItem> items) {"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="383"
-            column="71"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public static MediaDescriptionCompat createMediaDescriptionCompat(String mediaId) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="400"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public static MediaDescriptionCompat createMediaDescriptionCompat(String mediaId) {"
         errorLine2="                                                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="400"
-            column="71"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public static List&lt;QueueItem> convertToQueueItemList(List&lt;MediaItem> items) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="411"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public static List&lt;QueueItem> convertToQueueItemList(List&lt;MediaItem> items) {"
         errorLine2="                                                         ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="411"
-            column="58"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public static List&lt;MediaItem> convertParcelImplListSliceToMediaItemList("
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="445"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="            ParcelImplListSlice listSlice) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="446"
-            column="13"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public static &lt;T extends Parcelable> List&lt;T> truncateListBySize(final List&lt;T> list,"
         errorLine2="                                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="466"
-            column="42"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public static &lt;T extends Parcelable> List&lt;T> truncateListBySize(final List&lt;T> list,"
         errorLine2="                                                                          ~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="466"
-            column="75"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public static MediaMetadata convertToMediaMetadata(CharSequence queueTitle) {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="561"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public static MediaMetadata convertToMediaMetadata(CharSequence queueTitle) {"
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="561"
-            column="56"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public static MediaMetadataCompat convertToMediaMetadataCompat(MediaMetadata metadata) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="578"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public static MediaMetadataCompat convertToMediaMetadataCompat(MediaMetadata metadata) {"
         errorLine2="                                                                   ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="578"
-            column="68"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public static Rating convertToRating(RatingCompat ratingCompat) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="613"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public static Rating convertToRating(RatingCompat ratingCompat) {"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="613"
-            column="42"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public static RatingCompat convertToRatingCompat(Rating rating) {"
         errorLine2="                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="649"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    public static RatingCompat convertToRatingCompat(Rating rating) {"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="649"
-            column="54"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    public static List&lt;ParcelImpl> convertCommandButtonListToParcelImplList("
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="679"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="            List&lt;CommandButton> commandButtonList) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="680"
-            column="13"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    public static ParcelImplListSlice convertMediaItemListToParcelImplListSlice("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="695"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="            List&lt;MediaItem> mediaItemList) {"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="696"
-            column="13"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public static int convertToPlayerState(PlaybackStateCompat state) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="737"
-            column="44"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    public static MediaController.PlaybackInfo toPlaybackInfo2("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="781"
-            column="19"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="            MediaControllerCompat.PlaybackInfo info) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="782"
-            column="13"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    public static boolean isUnparcelableBundle(Bundle bundle) {"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="792"
-            column="48"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    public static void keepUnparcelableBundlesOnly(final List&lt;Bundle> bundles) {"
         errorLine2="                                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/MediaUtils.java"
-            line="808"
-            column="58"/>
+            file="src/main/java/androidx/media2/session/MediaUtils.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    public ComponentName getComponentName() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/SessionToken.java"
-            line="210"
-            column="12"/>
+            file="src/main/java/androidx/media2/session/SessionToken.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    public Object getBinder() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/SessionToken.java"
-            line="250"
-            column="12"/>
+            file="src/main/java/androidx/media2/session/SessionToken.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="        void onSessionTokenCreated(MediaSessionCompat.Token compatToken, SessionToken sessionToken);"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/SessionToken.java"
-            line="411"
-            column="36"/>
+            file="src/main/java/androidx/media2/session/SessionToken.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="        void onSessionTokenCreated(MediaSessionCompat.Token compatToken, SessionToken sessionToken);"
         errorLine2="                                                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/session/SessionToken.java"
-            line="411"
-            column="74"/>
+            file="src/main/java/androidx/media2/session/SessionToken.java"/>
     </issue>
 
 </issues>
diff --git a/media2/media2-session/version-compat-tests/common/lint-baseline.xml b/media2/media2-session/version-compat-tests/common/lint-baseline.xml
index d8bdee6..65cdb74 100644
--- a/media2/media2-session/version-compat-tests/common/lint-baseline.xml
+++ b/media2/media2-session/version-compat-tests/common/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public static void waitFor(final PollingCheckCondition condition) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/PollingCheck.java"
-            line="76"
-            column="38"/>
+            file="src/main/java/androidx/media2/test/common/PollingCheck.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public static void waitFor(long timeout, final PollingCheckCondition condition) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/PollingCheck.java"
-            line="90"
-            column="52"/>
+            file="src/main/java/androidx/media2/test/common/PollingCheck.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public static boolean equals(Bundle a, Bundle b) {"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="43"
-            column="34"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public static boolean equals(Bundle a, Bundle b) {"
         errorLine2="                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="43"
-            column="44"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public static boolean contains(Bundle a, Bundle b) {"
         errorLine2="                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="56"
-            column="36"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public static boolean contains(Bundle a, Bundle b) {"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="56"
-            column="46"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public static boolean equals(Object a, Object b) {"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="76"
-            column="34"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public static boolean equals(Object a, Object b) {"
         errorLine2="                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="76"
-            column="44"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public static Bundle createTestBundle() {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="89"
-            column="19"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public static String getMediaIdInFakeList(int index) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="98"
-            column="19"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        public SyncHandler(Looper looper) {"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="107"
-            column="28"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        public void postAndSync(final Runnable runnable) throws InterruptedException {"
         errorLine2="                                      ~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/test/common/TestUtils.java"
-            line="111"
-            column="39"/>
+            file="src/main/java/androidx/media2/test/common/TestUtils.java"/>
     </issue>
 
 </issues>
diff --git a/media2/media2-widget/lint-baseline.xml b/media2/media2-widget/lint-baseline.xml
index f1f7242..ef484c0 100644
--- a/media2/media2-widget/lint-baseline.xml
+++ b/media2/media2-widget/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    PixelCopy.request(source, dest, new PixelCopy.OnPixelCopyFinishedListener() {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/media2/widget/VideoView_WithPlayerTest.java"
-            line="478"
-            column="57"/>
+            file="src/androidTest/java/androidx/media2/widget/VideoView_WithPlayerTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    protected synchronized void updateActiveCues(boolean rebuild, long timeMs) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
-            line="127"
-            column="5"/>
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    private synchronized void takeTime(long timeMs) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
-            line="197"
-            column="5"/>
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    protected synchronized void clearActiveCues() {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
-            line="201"
-            column="5"/>
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    protected synchronized boolean addCue(Cue cue) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
-            line="291"
-            column="5"/>
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    /**"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"
-            line="364"
-            column="5"/>
+            file="src/main/java/androidx/media2/widget/SubtitleTrack.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    static class MediaFormatUtil {"
         errorLine2="                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/media2/widget/SubtitleController.java"
-            line="277"
-            column="18"/>
+            file="src/main/java/androidx/media2/widget/SubtitleController.java"/>
     </issue>
 
 </issues>
diff --git a/mediarouter/mediarouter/lint-baseline.xml b/mediarouter/mediarouter/lint-baseline.xml
index 465604f..dada845 100644
--- a/mediarouter/mediarouter/lint-baseline.xml
+++ b/mediarouter/mediarouter/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        setTurnScreenOn(true);"
         errorLine2="        ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/mediarouter/media/MediaRouter2TestActivity.java"
-            line="47"
-            column="9"/>
+            file="src/androidTest/java/androidx/mediarouter/media/MediaRouter2TestActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        setShowWhenLocked(true);"
         errorLine2="        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/mediarouter/media/MediaRouter2TestActivity.java"
-            line="48"
-            column="9"/>
+            file="src/androidTest/java/androidx/mediarouter/media/MediaRouter2TestActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                        mSelectRouteIntMethod.invoke(router, types, route);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="jellybean/androidx/mediarouter/media/MediaRouterJellybean.java"
-            line="340"
-            column="25"/>
+            file="jellybean/androidx/mediarouter/media/MediaRouterJellybean.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    return mGetSystemAudioRouteMethod.invoke(router);"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="jellybean/androidx/mediarouter/media/MediaRouterJellybean.java"
-            line="385"
-            column="28"/>
+            file="jellybean/androidx/mediarouter/media/MediaRouterJellybean.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                    mScanWifiDisplaysMethod.invoke(mDisplayManager);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java"
-            line="133"
-            column="21"/>
+            file="jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                    int statusCode = (Integer)mGetStatusCodeMethod.invoke(route);"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java"
-            line="175"
-            column="47"/>
+            file="jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        ScriptIntrinsicBlur blurScript = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));"
         errorLine2="                                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"
-            line="664"
-            column="62"/>
+            file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        blurScript.setRadius(radius);"
         errorLine2="                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"
-            line="665"
-            column="20"/>
+            file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        blurScript.setInput(allocation);"
         errorLine2="                   ~~~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"
-            line="666"
-            column="20"/>
+            file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        blurScript.forEach(blurAllocation);"
         errorLine2="                   ~~~~~~~">
         <location
-            file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"
-            line="667"
-            column="20"/>
+            file="src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void testReset() {"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java"
-            line="285"
-            column="17"/>
+            file="src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java"/>
     </issue>
 
 </issues>
diff --git a/navigation/integration-tests/testapp/lint-baseline.xml b/navigation/integration-tests/testapp/lint-baseline.xml
index 8b138dd..6902f84 100644
--- a/navigation/integration-tests/testapp/lint-baseline.xml
+++ b/navigation/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                notificationManager.createNotificationChannel("
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/navigation/testapp/AndroidFragment.kt"
-            line="65"
-            column="37"/>
+            file="src/main/java/androidx/navigation/testapp/AndroidFragment.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                    NotificationChannel("
         errorLine2="                    ^">
         <location
-            file="src/main/java/androidx/navigation/testapp/AndroidFragment.kt"
-            line="66"
-            column="21"/>
+            file="src/main/java/androidx/navigation/testapp/AndroidFragment.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            val fade = Fade()"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"
-            line="48"
-            column="24"/>
+            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            fade.excludeTarget(android.R.id.statusBarBackground, true)"
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"
-            line="49"
-            column="18"/>
+            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            fade.excludeTarget(android.R.id.navigationBarBackground, true)"
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"
-            line="50"
-            column="18"/>
+            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            window.exitTransition = fade"
         errorLine2="                   ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"
-            line="51"
-            column="20"/>
+            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            window.enterTransition = fade"
         errorLine2="                   ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"
-            line="52"
-            column="20"/>
+            file="src/main/java/androidx/navigation/testapp/HelpActivity.kt"/>
     </issue>
 
 </issues>
diff --git a/paging/integration-tests/testapp/lint-baseline.xml b/paging/integration-tests/testapp/lint-baseline.xml
index 7487fb1..b6e7857 100644
--- a/paging/integration-tests/testapp/lint-baseline.xml
+++ b/paging/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        final Button addButton = findViewById(R.id.addButton);"
         errorLine2="                                              ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListRxActivity.java"
-            line="51"
-            column="47"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListRxActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        final Button clearButton = findViewById(R.id.clearButton);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListRxActivity.java"
-            line="54"
-            column="49"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListRxActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                return new LastNameAscCustomerDataSource(db);"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/LastNameAscCustomerDataSource.java"
-            line="42"
-            column="24"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/LastNameAscCustomerDataSource.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public String getName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/Customer.java"
-            line="45"
-            column="12"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/Customer.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void setName(String name) {"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/Customer.java"
-            line="49"
-            column="25"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/Customer.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public String getLastName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/Customer.java"
-            line="53"
-            column="12"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/Customer.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public void setLastName(String lastName) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/Customer.java"
-            line="57"
-            column="29"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/Customer.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    void insert(Customer customer);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="39"
-            column="17"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    void insertAll(Customer[] customers);"
         errorLine2="                   ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="46"
-            column="20"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    DataSource.Factory&lt;Integer, Customer> loadPagedAgeOrder();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="59"
-            column="5"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    PagingSource&lt;Integer, Customer> loadPagedAgeOrderPagingSource();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="65"
-            column="5"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    LiveData&lt;List&lt;Customer>> all();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="77"
-            column="5"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    List&lt;Customer> customerNameInitial(int limit);"
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="82"
-            column="5"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    List&lt;Customer> customerNameLoadAfter(String key, int limit);"
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="85"
-            column="5"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    List&lt;Customer> customerNameLoadAfter(String key, int limit);"
         errorLine2="                                         ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="85"
-            column="42"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    int customerNameCountAfter(String key);"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="88"
-            column="32"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    List&lt;Customer> customerNameLoadBefore(String key, int limit);"
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="91"
-            column="5"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    List&lt;Customer> customerNameLoadBefore(String key, int limit);"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="91"
-            column="43"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    int customerNameCountBefore(String key);"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"
-            line="94"
-            column="33"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public CustomerViewModel(Application application) {"
         errorLine2="                             ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/CustomerViewModel.java"
-            line="44"
-            column="30"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/CustomerViewModel.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    protected void onCreate(final Bundle savedInstanceState) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListActivity.java"
-            line="42"
-            column="35"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListActivity.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    protected void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListActivity.java"
-            line="79"
-            column="40"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListActivity.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    protected void onCreate(final Bundle savedInstanceState) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListRxActivity.java"
-            line="40"
-            column="35"/>
+            file="src/main/java/androidx/paging/integration/testapp/room/RoomPagedListRxActivity.java"/>
     </issue>
 
 </issues>
diff --git a/preference/preference/lint-baseline.xml b/preference/preference/lint-baseline.xml
index e6f8601..e7829c9 100644
--- a/preference/preference/lint-baseline.xml
+++ b/preference/preference/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            holder.itemView.setAccessibilityHeading(true);"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/PreferenceCategory.java"
-            line="77"
-            column="29"/>
+            file="src/main/java/androidx/preference/PreferenceCategory.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    @Nullable OnBindEditTextListener getOnBindEditTextListener() {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/EditTextPreference.java"
-            line="164"
-            column="38"/>
+            file="src/main/java/androidx/preference/EditTextPreference.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    private int getValueIndex() {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="249"
-            column="17"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    private int getValueIndex() {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="249"
-            column="17"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public boolean shouldUseGeneratedIds() {"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/PreferenceScreen.java"
-            line="82"
-            column="20"/>
+            file="src/main/java/androidx/preference/PreferenceScreen.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    protected Object onGetDefaultValue(@NonNull TypedArray a, int index) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/EditTextPreference.java"
-            line="102"
-            column="15"/>
+            file="src/main/java/androidx/preference/EditTextPreference.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    protected void onSetInitialValue(Object defaultValue) {"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/EditTextPreference.java"
-            line="107"
-            column="38"/>
+            file="src/main/java/androidx/preference/EditTextPreference.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public static EditTextPreferenceDialogFragmentCompat newInstance(String key) {"
         errorLine2="                                                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java"
-            line="50"
-            column="70"/>
+            file="src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public void setEntries(CharSequence[] entries) {"
         errorLine2="                           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="102"
-            column="28"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public CharSequence[] getEntries() {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="119"
-            column="12"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void setEntryValues(CharSequence[] entryValues) {"
         errorLine2="                               ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="130"
-            column="32"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public CharSequence[] getEntryValues() {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="147"
-            column="12"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public void setValue(String value) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="188"
-            column="26"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public String getValue() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="206"
-            column="12"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public int findIndexOfValue(String value) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="227"
-            column="33"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    protected Object onGetDefaultValue(@NonNull TypedArray a, int index) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="254"
-            column="15"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    protected void onSetInitialValue(Object defaultValue) {"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreference.java"
-            line="259"
-            column="38"/>
+            file="src/main/java/androidx/preference/ListPreference.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public static ListPreferenceDialogFragmentCompat newInstance(String key) {"
         errorLine2="                                                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java"
-            line="39"
-            column="66"/>
+            file="src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public void setEntries(CharSequence[] entries) {"
         errorLine2="                           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/MultiSelectListPreference.java"
-            line="93"
-            column="28"/>
+            file="src/main/java/androidx/preference/MultiSelectListPreference.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public CharSequence[] getEntries() {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/MultiSelectListPreference.java"
-            line="110"
-            column="12"/>
+            file="src/main/java/androidx/preference/MultiSelectListPreference.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public void setEntryValues(CharSequence[] entryValues) {"
         errorLine2="                               ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/preference/MultiSelectListPreference.java"
-            line="121"
-            column="32"/>
+            file="src/main/java/androidx/preference/MultiSelectListPreference.java"/>
     </issue>
 
     <issue
@@ -239,7 +197,6 @@
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/preference/MultiSelectListPreference.java"
-            line="138"
             column="12"/>
     </issue>
 
diff --git a/print/print/lint-baseline.xml b/print/print/lint-baseline.xml
index 648ffab..4f280a4 100644
--- a/print/print/lint-baseline.xml
+++ b/print/print/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        PrintAttributes attr = new PrintAttributes.Builder()"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="271"
-            column="32"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                .setMediaSize(mediaSize)"
         errorLine2="                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="272"
-            column="18"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                .setColorMode(mColorMode)"
         errorLine2="                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="273"
-            column="18"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                .build();"
         errorLine2="                 ~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="274"
-            column="18"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        printManager.print(jobName,"
         errorLine2="                     ~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="276"
-            column="22"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        PrintAttributes.Builder builder = new PrintAttributes.Builder();"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="366"
-            column="43"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        builder.setColorMode(mColorMode);"
         errorLine2="                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="367"
-            column="17"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            builder.setMediaSize(PrintAttributes.MediaSize.UNKNOWN_LANDSCAPE);"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="370"
-            column="21"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            builder.setMediaSize(PrintAttributes.MediaSize.UNKNOWN_PORTRAIT);"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="372"
-            column="21"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        PrintAttributes attr = builder.build();"
         errorLine2="                                       ~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="374"
-            column="40"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        printManager.print(jobName, printDocumentAdapter, attr);"
         errorLine2="                     ~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="376"
-            column="22"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        PrintAttributes.Builder b = new PrintAttributes.Builder()"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/print/PrintHelper.java"
-            line="560"
-            column="37"/>
+            file="src/main/java/androidx/print/PrintHelper.java"/>
     </issue>
 
     <issue
diff --git a/recommendation/recommendation/lint-baseline.xml b/recommendation/recommendation/lint-baseline.xml
index 65f9f52..35d97bf 100644
--- a/recommendation/recommendation/lint-baseline.xml
+++ b/recommendation/recommendation/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public String getIdTag() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="369"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public String getTitle() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="378"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public String getText() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="387"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public String getSourceName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="396"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public Bitmap getContentImage() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="405"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public String getBackgroundImageUri() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="426"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public void setGroup(String groupTag) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="450"
-            column="26"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public String getGroup() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="459"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public void setSortKey(String sortKey) {"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="473"
-            column="28"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public String getSortKey() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="482"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public IntentData getContentIntent() {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="559"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public IntentData getDismissIntent() {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="570"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public String[] getContentTypes() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="582"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public String getPrimaryContentType() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="596"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public String[] getGenres() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="609"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public String getPricingType() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="622"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public String getPricingValue() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="633"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public String getMaturityRating() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="667"
-            column="12"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        public Builder setIdTag(String idTag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="750"
-            column="16"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        public Builder setIdTag(String idTag) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="750"
-            column="33"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="        public Builder setTitle(String title) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="761"
-            column="16"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="        public Builder setTitle(String title) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="761"
-            column="33"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="        public Builder setText(@Nullable String description) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="772"
-            column="16"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="        public Builder setSourceName(@Nullable String source) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="786"
-            column="16"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="        public Builder setContentImage(Bitmap image) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="797"
-            column="16"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="        public Builder setContentImage(Bitmap image) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="797"
-            column="40"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="        public Builder setBadgeIcon(@DrawableRes int iconResourceId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="812"
-            column="16"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="        public Builder setBackgroundImageUri(@Nullable String imageUri) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"
-            line="824"
-            column="16"/>
+            file="src/main/java/androidx/recommendation/app/ContentRecommendation.java"/>
     </issue>
 
     <issue
diff --git a/recyclerview/recyclerview-selection/lint-baseline.xml b/recyclerview/recyclerview-selection/lint-baseline.xml
index 6847c96..d09277b 100644
--- a/recyclerview/recyclerview-selection/lint-baseline.xml
+++ b/recyclerview/recyclerview-selection/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    @MainThread"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
-            line="71"
-            column="5"/>
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    @MainThread"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
-            line="82"
-            column="5"/>
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    /** @hide */"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
-            line="97"
-            column="5"/>
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    /** @hide */"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
-            line="109"
-            column="5"/>
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    /**"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"
-            line="115"
-            column="5"/>
+            file="src/main/java/androidx/recyclerview/selection/OperationMonitor.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public abstract boolean setItemsSelected(@NonNull Iterable&lt;K> keys, boolean selected);"
         errorLine2="                                                                        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"
-            line="166"
-            column="73"/>
+            file="src/main/java/androidx/recyclerview/selection/SelectionTracker.java"/>
     </issue>
 
 </issues>
diff --git a/recyclerview/recyclerview/lint-baseline.xml b/recyclerview/recyclerview/lint-baseline.xml
index 81582a2..9d51b64 100644
--- a/recyclerview/recyclerview/lint-baseline.xml
+++ b/recyclerview/recyclerview/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            super(context, attrs, defStyleAttr, defStyleRes);"
         errorLine2="            ~~~~~">
         <location
-            file="src/androidTest/java/androidx/recyclerview/widget/BaseWrapContentWithAspectRatioTest.java"
-            line="75"
-            column="13"/>
+            file="src/androidTest/java/androidx/recyclerview/widget/BaseWrapContentWithAspectRatioTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            } else if (duplicateDiffs.getOrDefault(after[index].id, 0) > 0 &amp;&amp; item.newItem) {"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/recyclerview/widget/DiffUtilTest.kt"
-            line="503"
-            column="39"/>
+            file="src/test/java/androidx/recyclerview/widget/DiffUtilTest.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            duplicateDiffs[it.id] = 1 + duplicateDiffs.getOrDefault(it.id, 1)"
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/recyclerview/widget/DiffUtilTest.kt"
-            line="549"
-            column="56"/>
+            file="src/test/java/androidx/recyclerview/widget/DiffUtilTest.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            duplicateDiffs[it.id] = -1 + duplicateDiffs.getOrDefault(it.id, 0)"
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/recyclerview/widget/DiffUtilTest.kt"
-            line="552"
-            column="57"/>
+            file="src/test/java/androidx/recyclerview/widget/DiffUtilTest.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                + &quot;handle it properly&quot;, true, mRecyclerView.isScrollContainer());"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/recyclerview/widget/RecyclerViewBasicTest.java"
-            line="105"
-            column="61"/>
+            file="src/androidTest/java/androidx/recyclerview/widget/RecyclerViewBasicTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            mRecyclerView.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusTest.java"
-            line="239"
-            column="27"/>
+            file="src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        super(context, attrs, defStyleAttr, defStyleRes);"
         errorLine2="        ~~~~~">
         <location
-            file="src/androidTest/java/androidx/recyclerview/widget/TestContentView.java"
-            line="53"
-            column="9"/>
+            file="src/androidTest/java/androidx/recyclerview/widget/TestContentView.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                            getMinimumWidth()),"
         errorLine2="                            ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/recyclerview/widget/TestedFrameLayout.java"
-            line="108"
-            column="29"/>
+            file="src/androidTest/java/androidx/recyclerview/widget/TestedFrameLayout.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                            getMinimumHeight()));"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/recyclerview/widget/TestedFrameLayout.java"
-            line="111"
-            column="29"/>
+            file="src/androidTest/java/androidx/recyclerview/widget/TestedFrameLayout.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="            super(source);"
         errorLine2="            ~~~~~">
         <location
-            file="src/androidTest/java/androidx/recyclerview/widget/TestedFrameLayout.java"
-            line="283"
-            column="13"/>
+            file="src/androidTest/java/androidx/recyclerview/widget/TestedFrameLayout.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        synchronized SyncQueueItem next() {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"
-            line="237"
-            column="9"/>
+            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        synchronized void sendMessageAtFrontOfQueue(SyncQueueItem item) {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"
-            line="246"
-            column="9"/>
+            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        synchronized void sendMessage(SyncQueueItem item) {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"
-            line="251"
-            column="9"/>
+            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        synchronized void removeMessages(int what) {"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"
-            line="263"
-            column="9"/>
+            file="src/main/java/androidx/recyclerview/widget/MessageThreadUtil.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public boolean hasFixedSize() {"
         errorLine2="                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1106"
-            column="20"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="        public final boolean hasStableIds() {"
         errorLine2="                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="7555"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        public final void setIsRecyclable(boolean recyclable) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11932"
-            column="27"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public void onChanged(int position, int count, Object payload) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/AdapterListUpdateCallback.java"
-            line="59"
-            column="52"/>
+            file="src/main/java/androidx/recyclerview/widget/AdapterListUpdateCallback.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        public Builder&lt;T> setMainThreadExecutor(Executor executor) {"
         errorLine2="                                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/AsyncDifferConfig.java"
-            line="101"
-            column="49"/>
+            file="src/main/java/androidx/recyclerview/widget/AsyncDifferConfig.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        public Builder&lt;T> setBackgroundThreadExecutor(Executor executor) {"
         errorLine2="                                                      ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/AsyncDifferConfig.java"
-            line="117"
-            column="55"/>
+            file="src/main/java/androidx/recyclerview/widget/AsyncDifferConfig.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public void onChanged(int position, int count, Object payload) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/BatchingListUpdateCallback.java"
-            line="109"
-            column="52"/>
+            file="src/main/java/androidx/recyclerview/widget/BatchingListUpdateCallback.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public boolean animateRemove(final RecyclerView.ViewHolder holder) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"
-            line="192"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public boolean animateAdd(final RecyclerView.ViewHolder holder) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"
-            line="221"
-            column="37"/>
+            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public boolean animateMove(final RecyclerView.ViewHolder holder, int fromX, int fromY,"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"
-            line="255"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public boolean animateChange(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder,"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"
-            line="319"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public boolean animateChange(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder,"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"
-            line="319"
-            column="69"/>
+            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public void endAnimation(RecyclerView.ViewHolder item) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"
-            line="436"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/DefaultItemAnimator.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public DividerItemDecoration(Context context, int orientation) {"
         errorLine2="                                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"
-            line="66"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"
-            line="112"
-            column="24"/>
+            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"
-            line="112"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"
-            line="112"
-            column="55"/>
+            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"
-            line="178"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,"
         errorLine2="                                             ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"
-            line="178"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,"
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"
-            line="178"
-            column="57"/>
+            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"
-            line="179"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    public GridLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="71"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    public GridLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,"
         errorLine2="                                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="71"
-            column="47"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    public GridLayoutManager(Context context, int spanCount) {"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="84"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    public GridLayoutManager(Context context, int spanCount,"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="96"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    public int getRowCountForAccessibility(RecyclerView.Recycler recycler,"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="117"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="118"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    public int getColumnCountForAccessibility(RecyclerView.Recycler recycler,"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="131"
-            column="47"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="132"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public void onInitializeAccessibilityNodeInfoForItem(RecyclerView.Recycler recycler,"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="145"
-            column="58"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="            RecyclerView.State state, View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="146"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="            RecyclerView.State state, View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="                                      ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="146"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="            RecyclerView.State state, View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="146"
-            column="50"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="166"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="166"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    public void onLayoutCompleted(RecyclerView.State state) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="178"
-            column="35"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    public void onItemsAdded(RecyclerView recyclerView, int positionStart, int itemCount) {"
         errorLine2="                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="199"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    public void onItemsChanged(RecyclerView recyclerView) {"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="205"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="    public void onItemsRemoved(RecyclerView recyclerView, int positionStart, int itemCount) {"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="211"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public void onItemsUpdated(RecyclerView recyclerView, int positionStart, int itemCount,"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="217"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="            Object payload) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="218"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public void onItemsMoved(RecyclerView recyclerView, int from, int to, int itemCount) {"
         errorLine2="                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="224"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateDefaultLayoutParams() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="230"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="241"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                                          ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="241"
-            column="59"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                                                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="241"
-            column="70"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="246"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="246"
-            column="59"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="    public boolean checkLayoutParams(RecyclerView.LayoutParams lp) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="255"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="    public void setSpanSizeLookup(SpanSizeLookup spanSizeLookup) {"
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="265"
-            column="35"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="    public SpanSizeLookup getSpanSizeLookup() {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="274"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="    public void setMeasuredDimension(Rect childrenBounds, int wSpec, int hSpec) {"
         errorLine2="                                     ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="289"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler,"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="374"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -744,9 +610,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="375"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -755,9 +619,7 @@
         errorLine1="    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler,"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="382"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -766,9 +628,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="383"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -777,9 +637,7 @@
         errorLine1="    public View onFocusSearchFailed(View focused, int direction,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1076"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -788,9 +646,7 @@
         errorLine1="    public View onFocusSearchFailed(View focused, int direction,"
         errorLine2="                                    ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1076"
-            column="37"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -799,9 +655,7 @@
         errorLine1="            RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1077"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -810,9 +664,7 @@
         errorLine1="            RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1077"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -821,9 +673,7 @@
         errorLine1="    public int computeHorizontalScrollRange(RecyclerView.State state) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1204"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -832,9 +682,7 @@
         errorLine1="    public int computeVerticalScrollRange(RecyclerView.State state) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1213"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -843,9 +691,7 @@
         errorLine1="    public int computeHorizontalScrollOffset(RecyclerView.State state) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1222"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -854,9 +700,7 @@
         errorLine1="    public int computeVerticalScrollOffset(RecyclerView.State state) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1231"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -865,9 +709,7 @@
         errorLine1="        public LayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                            ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1389"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -876,9 +718,7 @@
         errorLine1="        public LayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1389"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -887,9 +727,7 @@
         errorLine1="        public LayoutParams(ViewGroup.MarginLayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1397"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -898,9 +736,7 @@
         errorLine1="        public LayoutParams(ViewGroup.LayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1401"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -909,9 +745,7 @@
         errorLine1="        public LayoutParams(RecyclerView.LayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"
-            line="1405"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/GridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -920,9 +754,7 @@
         errorLine1="    public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="543"
-            column="28"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -931,9 +763,7 @@
         errorLine1="    public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="543"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -942,9 +772,7 @@
         errorLine1="    public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="543"
-            column="59"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -953,9 +781,7 @@
         errorLine1="    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="555"
-            column="24"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -964,9 +790,7 @@
         errorLine1="    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="555"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -975,9 +799,7 @@
         errorLine1="    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="555"
-            column="55"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -986,9 +808,7 @@
         errorLine1="    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="933"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -997,9 +817,7 @@
         errorLine1="    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,"
         errorLine2="                                             ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="933"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -1008,9 +826,7 @@
         errorLine1="    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,"
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="933"
-            column="57"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -1019,9 +835,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="934"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -1030,9 +844,7 @@
         errorLine1="        public ViewHolder chooseDropTarget(@NonNull ViewHolder selected,"
         errorLine2="               ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="1804"
-            column="16"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -1041,9 +853,7 @@
         errorLine1="                ViewHolder viewHolder,"
         errorLine2="                ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"
-            line="2107"
-            column="17"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java"/>
     </issue>
 
     <issue
@@ -1052,9 +862,7 @@
         errorLine1="    void onDraw(Canvas c, RecyclerView recyclerView, View view,"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"
-            line="41"
-            column="17"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"/>
     </issue>
 
     <issue
@@ -1063,9 +871,7 @@
         errorLine1="    void onDraw(Canvas c, RecyclerView recyclerView, View view,"
         errorLine2="                          ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"
-            line="41"
-            column="27"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"/>
     </issue>
 
     <issue
@@ -1074,9 +880,7 @@
         errorLine1="    void onDraw(Canvas c, RecyclerView recyclerView, View view,"
         errorLine2="                                                     ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"
-            line="41"
-            column="54"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"/>
     </issue>
 
     <issue
@@ -1085,9 +889,7 @@
         errorLine1="    void onDrawOver(Canvas c, RecyclerView recyclerView, View view,"
         errorLine2="                    ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"
-            line="48"
-            column="21"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"/>
     </issue>
 
     <issue
@@ -1096,9 +898,7 @@
         errorLine1="    void onDrawOver(Canvas c, RecyclerView recyclerView, View view,"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"
-            line="48"
-            column="31"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"/>
     </issue>
 
     <issue
@@ -1107,9 +907,7 @@
         errorLine1="    void onDrawOver(Canvas c, RecyclerView recyclerView, View view,"
         errorLine2="                                                         ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"
-            line="48"
-            column="58"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"/>
     </issue>
 
     <issue
@@ -1118,9 +916,7 @@
         errorLine1="    void clearView(View view);"
         errorLine2="                   ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"
-            line="55"
-            column="20"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"/>
     </issue>
 
     <issue
@@ -1129,9 +925,7 @@
         errorLine1="    void onSelected(View view);"
         errorLine2="                    ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"
-            line="61"
-            column="21"/>
+            file="src/main/java/androidx/recyclerview/widget/ItemTouchUIUtil.java"/>
     </issue>
 
     <issue
@@ -1140,9 +934,7 @@
         errorLine1="    public LinearLayoutManager(Context context) {"
         errorLine2="                               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="158"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1151,9 +943,7 @@
         errorLine1="    public LinearLayoutManager(Context context, @RecyclerView.Orientation int orientation,"
         errorLine2="                               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="168"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1162,9 +952,7 @@
         errorLine1="    public LinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,"
         errorLine2="                               ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="182"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1173,9 +961,7 @@
         errorLine1="    public LinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,"
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="182"
-            column="49"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1184,9 +970,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateDefaultLayoutParams() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="199"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1195,9 +979,7 @@
         errorLine1="    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {"
         errorLine2="                                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="233"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1206,9 +988,7 @@
         errorLine1="    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="233"
-            column="57"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1217,9 +997,7 @@
         errorLine1="    public void onInitializeAccessibilityEvent(AccessibilityEvent event) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="242"
-            column="48"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1228,9 +1006,7 @@
         errorLine1="    public Parcelable onSaveInstanceState() {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="251"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1239,9 +1015,7 @@
         errorLine1="    public void onRestoreInstanceState(Parcelable state) {"
         errorLine2="                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="278"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1250,9 +1024,7 @@
         errorLine1="    public View findViewByPosition(int position) {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="409"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1261,9 +1033,7 @@
         errorLine1="    protected int getExtraLayoutSpace(RecyclerView.State state) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="449"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1272,9 +1042,7 @@
         errorLine1="    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="503"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1283,9 +1051,7 @@
         errorLine1="    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="503"
-            column="67"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1294,9 +1060,7 @@
         errorLine1="    public PointF computeScrollVectorForPosition(int targetPosition) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="512"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1305,9 +1069,7 @@
         errorLine1="    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="529"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1316,9 +1078,7 @@
         errorLine1="    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="529"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1327,9 +1087,7 @@
         errorLine1="    public void onLayoutCompleted(RecyclerView.State state) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="727"
-            column="35"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1338,9 +1096,7 @@
         errorLine1="    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler,"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1119"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1349,9 +1105,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1120"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1360,9 +1114,7 @@
         errorLine1="    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler,"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1131"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1371,9 +1123,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1132"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1382,9 +1132,7 @@
         errorLine1="    public int computeHorizontalScrollOffset(RecyclerView.State state) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1140"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1393,9 +1141,7 @@
         errorLine1="    public int computeVerticalScrollOffset(RecyclerView.State state) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1145"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1404,9 +1150,7 @@
         errorLine1="    public int computeHorizontalScrollExtent(RecyclerView.State state) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1150"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1415,9 +1159,7 @@
         errorLine1="    public int computeVerticalScrollExtent(RecyclerView.State state) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1155"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1426,9 +1168,7 @@
         errorLine1="    public int computeHorizontalScrollRange(RecyclerView.State state) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1160"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1437,9 +1177,7 @@
         errorLine1="    public int computeVerticalScrollRange(RecyclerView.State state) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1165"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1448,9 +1186,7 @@
         errorLine1="            LayoutPrefetchRegistry layoutPrefetchRegistry) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1291"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1459,9 +1195,7 @@
         errorLine1="    public void collectAdjacentPrefetchPositions(int dx, int dy, RecyclerView.State state,"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1370"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1470,9 +1204,7 @@
         errorLine1="            LayoutPrefetchRegistry layoutPrefetchRegistry) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1371"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1481,9 +1213,7 @@
         errorLine1="    public void assertNotInLayoutOrScroll(String message) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="1412"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1492,9 +1222,7 @@
         errorLine1="    public View onFocusSearchFailed(View focused, int direction,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="2066"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1503,9 +1231,7 @@
         errorLine1="    public View onFocusSearchFailed(View focused, int direction,"
         errorLine2="                                    ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="2066"
-            column="37"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1514,9 +1240,7 @@
         errorLine1="            RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="2067"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1525,9 +1249,7 @@
         errorLine1="            RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="2067"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1536,9 +1258,7 @@
         errorLine1="        public SavedState(SavedState other) {"
         errorLine2="                          ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="2432"
-            column="27"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1547,9 +1267,7 @@
         errorLine1="        public void writeToParcel(Parcel dest, int flags) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"
-            line="2452"
-            column="35"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java"/>
     </issue>
 
     <issue
@@ -1558,9 +1276,7 @@
         errorLine1="    protected PointF mTargetVector;"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="83"
-            column="15"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1569,9 +1285,7 @@
         errorLine1="    public LinearSmoothScroller(Context context) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="93"
-            column="33"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1580,9 +1294,7 @@
         errorLine1="    protected void onTargetFound(View targetView, RecyclerView.State state, Action action) {"
         errorLine2="                                 ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="109"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1591,9 +1303,7 @@
         errorLine1="    protected void onTargetFound(View targetView, RecyclerView.State state, Action action) {"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="109"
-            column="51"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1602,9 +1312,7 @@
         errorLine1="    protected void onTargetFound(View targetView, RecyclerView.State state, Action action) {"
         errorLine2="                                                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="109"
-            column="77"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1613,9 +1321,7 @@
         errorLine1="    protected void onSeekTargetStep(int dx, int dy, RecyclerView.State state, Action action) {"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="123"
-            column="53"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1624,9 +1330,7 @@
         errorLine1="    protected void onSeekTargetStep(int dx, int dy, RecyclerView.State state, Action action) {"
         errorLine2="                                                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="123"
-            column="79"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1635,9 +1339,7 @@
         errorLine1="    protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {"
         errorLine2="                                           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="165"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1646,9 +1348,7 @@
         errorLine1="    protected void updateActionForInterimTarget(Action action) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="242"
-            column="49"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1657,9 +1357,7 @@
         errorLine1="    public int calculateDyToMakeVisible(View view, int snapPreference) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="313"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1668,9 +1366,7 @@
         errorLine1="    public int calculateDxToMakeVisible(View view, int snapPreference) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"
-            line="338"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java"/>
     </issue>
 
     <issue
@@ -1679,9 +1375,7 @@
         errorLine1="    public int[] calculateDistanceToFinalSnap("
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSnapHelper.java"
-            line="44"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSnapHelper.java"/>
     </issue>
 
     <issue
@@ -1690,9 +1384,7 @@
         errorLine1="    public int findTargetSnapPosition(RecyclerView.LayoutManager layoutManager, int velocityX,"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSnapHelper.java"
-            line="64"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSnapHelper.java"/>
     </issue>
 
     <issue
@@ -1701,9 +1393,7 @@
         errorLine1="    public View findSnapView(RecyclerView.LayoutManager layoutManager) {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSnapHelper.java"
-            line="132"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSnapHelper.java"/>
     </issue>
 
     <issue
@@ -1712,9 +1402,7 @@
         errorLine1="    public View findSnapView(RecyclerView.LayoutManager layoutManager) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/LinearSnapHelper.java"
-            line="132"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/LinearSnapHelper.java"/>
     </issue>
 
     <issue
@@ -1723,9 +1411,7 @@
         errorLine1="    public RecyclerView.LayoutManager getLayoutManager() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="54"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1734,9 +1420,7 @@
         errorLine1="    public abstract int getDecoratedStart(View view);"
         errorLine2="                                          ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="91"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1745,9 +1429,7 @@
         errorLine1="    public abstract int getDecoratedEnd(View view);"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="103"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1756,9 +1438,7 @@
         errorLine1="    public abstract int getTransformedEndWithDecoration(View view);"
         errorLine2="                                                        ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="119"
-            column="57"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1767,9 +1447,7 @@
         errorLine1="    public abstract int getTransformedStartWithDecoration(View view);"
         errorLine2="                                                          ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="135"
-            column="59"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1778,9 +1456,7 @@
         errorLine1="    public abstract int getDecoratedMeasurement(View view);"
         errorLine2="                                                ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="145"
-            column="49"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1789,9 +1465,7 @@
         errorLine1="    public abstract int getDecoratedMeasurementInOther(View view);"
         errorLine2="                                                       ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="155"
-            column="56"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1800,9 +1474,7 @@
         errorLine1="    public abstract void offsetChild(View view, int offset);"
         errorLine2="                                     ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="199"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1811,9 +1483,7 @@
         errorLine1="    public static OrientationHelper createOrientationHelper("
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="239"
-            column="19"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1822,9 +1492,7 @@
         errorLine1="            RecyclerView.LayoutManager layoutManager, @RecyclerView.Orientation int orientation) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="240"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1833,9 +1501,7 @@
         errorLine1="    public static OrientationHelper createHorizontalHelper("
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="256"
-            column="19"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1844,9 +1510,7 @@
         errorLine1="            RecyclerView.LayoutManager layoutManager) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="257"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1855,9 +1519,7 @@
         errorLine1="    public static OrientationHelper createVerticalHelper(RecyclerView.LayoutManager layoutManager) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="355"
-            column="19"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1866,9 +1528,7 @@
         errorLine1="    public static OrientationHelper createVerticalHelper(RecyclerView.LayoutManager layoutManager) {"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"
-            line="355"
-            column="58"/>
+            file="src/main/java/androidx/recyclerview/widget/OrientationHelper.java"/>
     </issue>
 
     <issue
@@ -1877,9 +1537,7 @@
         errorLine1="    public View findSnapView(RecyclerView.LayoutManager layoutManager) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/PagerSnapHelper.java"
-            line="70"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/PagerSnapHelper.java"/>
     </issue>
 
     <issue
@@ -1888,9 +1546,7 @@
         errorLine1="    public int findTargetSnapPosition(RecyclerView.LayoutManager layoutManager, int velocityX,"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/PagerSnapHelper.java"
-            line="80"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/PagerSnapHelper.java"/>
     </issue>
 
     <issue
@@ -1899,9 +1555,7 @@
         errorLine1="    public CharSequence getAccessibilityClassName() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="810"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1910,9 +1564,7 @@
         errorLine1="    protected Parcelable onSaveInstanceState() {"
         errorLine2="              ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1445"
-            column="15"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1921,9 +1573,7 @@
         errorLine1="    protected void onRestoreInstanceState(Parcelable state) {"
         errorLine2="                                          ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1459"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1932,9 +1582,7 @@
         errorLine1="    protected void dispatchSaveInstanceState(SparseArray&lt;Parcelable> container) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1481"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1943,9 +1591,7 @@
         errorLine1="    protected void dispatchRestoreInstanceState(SparseArray&lt;Parcelable> container) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="1489"
-            column="49"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1954,9 +1600,7 @@
         errorLine1="    public void setLayoutTransition(LayoutTransition transition) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2495"
-            column="37"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1965,9 +1609,7 @@
         errorLine1="    public View focusSearch(View focused, int direction) {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2983"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1976,9 +1618,7 @@
         errorLine1="    public View focusSearch(View focused, int direction) {"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="2983"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1987,9 +1627,7 @@
         errorLine1="    public void requestChildFocus(View child, View focused) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3128"
-            column="35"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -1998,9 +1636,7 @@
         errorLine1="    public void requestChildFocus(View child, View focused) {"
         errorLine2="                                              ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3128"
-            column="47"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2009,9 +1645,7 @@
         errorLine1="    public boolean requestChildRectangleOnScreen(View child, Rect rect, boolean immediate) {"
         errorLine2="                                                 ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3174"
-            column="50"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2020,9 +1654,7 @@
         errorLine1="    public boolean requestChildRectangleOnScreen(View child, Rect rect, boolean immediate) {"
         errorLine2="                                                             ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3174"
-            column="62"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2031,9 +1663,7 @@
         errorLine1="    public void addFocusables(ArrayList&lt;View> views, int direction, int focusableMode) {"
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3179"
-            column="31"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2042,9 +1672,7 @@
         errorLine1="    protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocusedRect) {"
         errorLine2="                                                                 ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3186"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2053,9 +1681,7 @@
         errorLine1="    public boolean onInterceptTouchEvent(MotionEvent e) {"
         errorLine2="                                         ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3398"
-            column="42"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2064,9 +1690,7 @@
         errorLine1="    public boolean onTouchEvent(MotionEvent e) {"
         errorLine2="                                ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3552"
-            column="33"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2075,9 +1699,7 @@
         errorLine1="    public boolean onGenericMotionEvent(MotionEvent event) {"
         errorLine2="                                        ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="3741"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2086,9 +1708,7 @@
         errorLine1="    public void sendAccessibilityEventUnchecked(AccessibilityEvent event) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4019"
-            column="49"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2097,9 +1717,7 @@
         errorLine1="    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4027"
-            column="55"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2108,9 +1726,7 @@
         errorLine1="    protected void removeDetachedView(View child, boolean animate) {"
         errorLine2="                                      ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4645"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2119,9 +1735,7 @@
         errorLine1="    public void draw(Canvas c) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4740"
-            column="22"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2130,9 +1744,7 @@
         errorLine1="    public void onDraw(Canvas c) {"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4801"
-            column="24"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2141,9 +1753,7 @@
         errorLine1="    protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4811"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2152,9 +1762,7 @@
         errorLine1="    protected ViewGroup.LayoutParams generateDefaultLayoutParams() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4816"
-            column="15"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2163,9 +1771,7 @@
         errorLine1="    public ViewGroup.LayoutParams generateLayoutParams(AttributeSet attrs) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4824"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2174,9 +1780,7 @@
         errorLine1="    public ViewGroup.LayoutParams generateLayoutParams(AttributeSet attrs) {"
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4824"
-            column="56"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2185,9 +1789,7 @@
         errorLine1="    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4832"
-            column="15"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2196,9 +1798,7 @@
         errorLine1="    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="4832"
-            column="59"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2207,9 +1807,7 @@
         errorLine1="    public ViewHolder getChildViewHolder(@NonNull View child) {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5079"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2218,9 +1816,7 @@
         errorLine1="    public ViewHolder findViewHolderForItemId(long id) {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5297"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2229,9 +1825,7 @@
         errorLine1="    public boolean drawChild(Canvas canvas, View child, long drawingTime) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5341"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2240,9 +1834,7 @@
         errorLine1="    public boolean drawChild(Canvas canvas, View child, long drawingTime) {"
         errorLine2="                                            ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="5341"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2251,9 +1843,7 @@
         errorLine1="        public void putRecycledView(ViewHolder scrap) {"
         errorLine2="                                    ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="6070"
-            column="37"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2262,9 +1852,7 @@
         errorLine1="        public void setMeasuredDimension(Rect childrenBounds, int wSpec, int hSpec) {"
         errorLine2="                                         ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8294"
-            column="42"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2273,9 +1861,7 @@
         errorLine1="        public void assertInLayoutOrScroll(String message) {"
         errorLine2="                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8318"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2284,9 +1870,7 @@
         errorLine1="        public void assertNotInLayoutOrScroll(String message) {"
         errorLine2="                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8354"
-            column="47"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2295,9 +1879,7 @@
         errorLine1="        public void collectAdjacentPrefetchPositions(int dx, int dy, State state,"
         errorLine2="                                                                     ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8533"
-            column="70"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2306,9 +1888,7 @@
         errorLine1="                LayoutPrefetchRegistry layoutPrefetchRegistry) {"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8534"
-            column="17"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2317,9 +1897,7 @@
         errorLine1="                LayoutPrefetchRegistry layoutPrefetchRegistry) {"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8562"
-            column="17"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2328,9 +1906,7 @@
         errorLine1="        public void postOnAnimation(Runnable action) {"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8595"
-            column="37"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2339,9 +1915,7 @@
         errorLine1="        public boolean removeCallbacks(Runnable action) {"
         errorLine2="                                       ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8613"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2350,9 +1924,7 @@
         errorLine1="        public void onAttachedToWindow(RecyclerView view) {"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8634"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2361,9 +1933,7 @@
         errorLine1="        public void onDetachedFromWindow(RecyclerView view) {"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8641"
-            column="42"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2372,9 +1942,7 @@
         errorLine1="        public void onDetachedFromWindow(RecyclerView view, Recycler recycler) {"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8668"
-            column="42"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2383,9 +1951,7 @@
         errorLine1="        public void onDetachedFromWindow(RecyclerView view, Recycler recycler) {"
         errorLine2="                                                            ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8668"
-            column="61"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2394,9 +1960,7 @@
         errorLine1="        public void onLayoutChildren(Recycler recycler, State state) {"
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8732"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2405,9 +1969,7 @@
         errorLine1="        public void onLayoutChildren(Recycler recycler, State state) {"
         errorLine2="                                                        ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8732"
-            column="57"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2416,9 +1978,7 @@
         errorLine1="        public void onLayoutCompleted(State state) {"
         errorLine2="                                      ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8747"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2427,9 +1987,7 @@
         errorLine1="        public abstract LayoutParams generateDefaultLayoutParams();"
         errorLine2="                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8765"
-            column="25"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2438,9 +1996,7 @@
         errorLine1="        public boolean checkLayoutParams(LayoutParams lp) {"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8777"
-            column="42"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2449,9 +2005,7 @@
         errorLine1="        public LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {"
         errorLine2="               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8794"
-            column="16"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2460,9 +2014,7 @@
         errorLine1="        public LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8794"
-            column="50"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2471,9 +2023,7 @@
         errorLine1="        public LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8818"
-            column="16"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2482,9 +2032,7 @@
         errorLine1="        public LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                                 ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8818"
-            column="50"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2493,9 +2041,7 @@
         errorLine1="        public LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                                            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8818"
-            column="61"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2504,9 +2050,7 @@
         errorLine1="        public int scrollHorizontallyBy(int dx, Recycler recycler, State state) {"
         errorLine2="                                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8835"
-            column="49"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2515,9 +2059,7 @@
         errorLine1="        public int scrollHorizontallyBy(int dx, Recycler recycler, State state) {"
         errorLine2="                                                                   ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8835"
-            column="68"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2526,9 +2068,7 @@
         errorLine1="        public int scrollVerticallyBy(int dy, Recycler recycler, State state) {"
         errorLine2="                                              ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8852"
-            column="47"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2537,9 +2077,7 @@
         errorLine1="        public int scrollVerticallyBy(int dy, Recycler recycler, State state) {"
         errorLine2="                                                                 ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8852"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2548,9 +2086,7 @@
         errorLine1="        public void smoothScrollToPosition(RecyclerView recyclerView, State state,"
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8899"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2559,9 +2095,7 @@
         errorLine1="        public void smoothScrollToPosition(RecyclerView recyclerView, State state,"
         errorLine2="                                                                      ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8899"
-            column="71"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2570,9 +2104,7 @@
         errorLine1="        public void startSmoothScroll(SmoothScroller smoothScroller) {"
         errorLine2="                                      ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8914"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2581,9 +2113,7 @@
         errorLine1="        public void endAnimation(View view) {"
         errorLine2="                                 ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8948"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2592,9 +2122,7 @@
         errorLine1="        public void addDisappearingView(View child) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8967"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2603,9 +2131,7 @@
         errorLine1="        public void addDisappearingView(View child, int index) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8985"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2614,9 +2140,7 @@
         errorLine1="        public void addView(View child) {"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="8996"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2625,9 +2149,7 @@
         errorLine1="        public void addView(View child, int index) {"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="9008"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2636,9 +2158,7 @@
         errorLine1="        public void removeView(View child) {"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="9074"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2647,9 +2167,7 @@
         errorLine1="        public void attachView(@NonNull View child, int index, LayoutParams lp) {"
         errorLine2="                                                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="9251"
-            column="64"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2658,9 +2176,7 @@
         errorLine1="        public void onRestoreInstanceState(Parcelable state) {"
         errorLine2="                                           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="10733"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2669,9 +2185,7 @@
         errorLine1="        public static Properties getProperties(@NonNull Context context,"
         errorLine2="                      ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="11061"
-            column="23"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2680,9 +2194,7 @@
         errorLine1="            int dyUnconsumed, int[] offsetInWindow) {"
         errorLine2="                              ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12086"
-            column="31"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2691,9 +2203,7 @@
         errorLine1="            int dyUnconsumed, int[] offsetInWindow, int type) {"
         errorLine2="                              ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12093"
-            column="31"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2702,9 +2212,7 @@
         errorLine1="            int dyUnconsumed, int[] offsetInWindow, int type, @NonNull int[] consumed) {"
         errorLine2="                              ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12100"
-            column="31"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2713,9 +2221,7 @@
         errorLine1="    public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow) {"
         errorLine2="                                                           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12106"
-            column="60"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2724,9 +2230,7 @@
         errorLine1="    public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow) {"
         errorLine2="                                                                           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12106"
-            column="76"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2735,9 +2239,7 @@
         errorLine1="    public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow,"
         errorLine2="                                                           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12111"
-            column="60"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2746,9 +2248,7 @@
         errorLine1="    public boolean dispatchNestedPreScroll(int dx, int dy, int[] consumed, int[] offsetInWindow,"
         errorLine2="                                                                           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12111"
-            column="76"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2757,9 +2257,7 @@
         errorLine1="        public LayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                            ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12142"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2768,9 +2266,7 @@
         errorLine1="        public LayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12142"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2779,9 +2275,7 @@
         errorLine1="        public LayoutParams(MarginLayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12150"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2790,9 +2284,7 @@
         errorLine1="        public LayoutParams(ViewGroup.LayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12154"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2801,9 +2293,7 @@
         errorLine1="        public LayoutParams(LayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12158"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2812,9 +2302,7 @@
         errorLine1="        public int getChildPosition(View view) {"
         errorLine2="                                    ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12512"
-            column="37"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2823,9 +2311,7 @@
         errorLine1="        public View findViewByPosition(int position) {"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12526"
-            column="16"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2834,9 +2320,7 @@
         errorLine1="        protected void onChildAttachedToWindow(View child) {"
         errorLine2="                                               ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12539"
-            column="48"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2845,9 +2329,7 @@
         errorLine1="        public void writeToParcel(Parcel dest, int flags) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="12891"
-            column="35"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2856,9 +2338,7 @@
         errorLine1="        public void put(int resourceId, Object data) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"
-            line="13119"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerView.java"/>
     </issue>
 
     <issue
@@ -2867,9 +2347,7 @@
         errorLine1="    public boolean performAccessibilityAction(View host, int action, Bundle args) {"
         errorLine2="                                              ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="59"
-            column="47"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2878,9 +2356,7 @@
         errorLine1="    public boolean performAccessibilityAction(View host, int action, Bundle args) {"
         errorLine2="                                                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="59"
-            column="70"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2889,9 +2365,7 @@
         errorLine1="    public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="71"
-            column="51"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2900,9 +2374,7 @@
         errorLine1="    public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="71"
-            column="62"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2911,9 +2383,7 @@
         errorLine1="    public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {"
         errorLine2="                                               ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="79"
-            column="48"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2922,9 +2392,7 @@
         errorLine1="    public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="79"
-            column="59"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2933,9 +2401,7 @@
         errorLine1="        public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="                                                      ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="142"
-            column="55"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2944,9 +2410,7 @@
         errorLine1="        public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="142"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2955,9 +2419,7 @@
         errorLine1="        public boolean performAccessibilityAction(View host, int action, Bundle args) {"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="159"
-            column="51"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2966,9 +2428,7 @@
         errorLine1="        public boolean performAccessibilityAction(View host, int action, Bundle args) {"
         errorLine2="                                                                         ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"
-            line="159"
-            column="74"/>
+            file="src/main/java/androidx/recyclerview/widget/RecyclerViewAccessibilityDelegate.java"/>
     </issue>
 
     <issue
@@ -2977,9 +2437,7 @@
         errorLine1="    public abstract boolean animateRemove(RecyclerView.ViewHolder holder);"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="188"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -2988,9 +2446,7 @@
         errorLine1="    public abstract boolean animateAdd(RecyclerView.ViewHolder holder);"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="213"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -2999,9 +2455,7 @@
         errorLine1="    public abstract boolean animateMove(RecyclerView.ViewHolder holder, int fromX, int fromY,"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="233"
-            column="41"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3010,9 +2464,7 @@
         errorLine1="    public abstract boolean animateChange(RecyclerView.ViewHolder oldHolder,"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="266"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3021,9 +2473,7 @@
         errorLine1="            RecyclerView.ViewHolder newHolder, int fromLeft, int fromTop, int toLeft, int toTop);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="267"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3032,9 +2482,7 @@
         errorLine1="    public final void dispatchRemoveFinished(RecyclerView.ViewHolder item) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="276"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3043,9 +2491,7 @@
         errorLine1="    public final void dispatchMoveFinished(RecyclerView.ViewHolder item) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="291"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3054,9 +2500,7 @@
         errorLine1="    public final void dispatchAddFinished(RecyclerView.ViewHolder item) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="301"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3065,9 +2509,7 @@
         errorLine1="    public final void dispatchChangeFinished(RecyclerView.ViewHolder item, boolean oldItem) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="316"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3076,9 +2518,7 @@
         errorLine1="    public final void dispatchRemoveStarting(RecyclerView.ViewHolder item) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="326"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3087,9 +2527,7 @@
         errorLine1="    public final void dispatchMoveStarting(RecyclerView.ViewHolder item) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="335"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3098,9 +2536,7 @@
         errorLine1="    public final void dispatchAddStarting(RecyclerView.ViewHolder item) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="344"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3109,9 +2545,7 @@
         errorLine1="    public final void dispatchChangeStarting(RecyclerView.ViewHolder item, boolean oldItem) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="357"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3120,9 +2554,7 @@
         errorLine1="    public void onRemoveStarting(RecyclerView.ViewHolder item) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="370"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3131,9 +2563,7 @@
         errorLine1="    public void onRemoveFinished(RecyclerView.ViewHolder item) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="381"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3142,9 +2572,7 @@
         errorLine1="    public void onAddStarting(RecyclerView.ViewHolder item) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="393"
-            column="31"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3153,9 +2581,7 @@
         errorLine1="    public void onAddFinished(RecyclerView.ViewHolder item) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="404"
-            column="31"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3164,9 +2590,7 @@
         errorLine1="    public void onMoveStarting(RecyclerView.ViewHolder item) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="416"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3175,9 +2599,7 @@
         errorLine1="    public void onMoveFinished(RecyclerView.ViewHolder item) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="427"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3186,9 +2608,7 @@
         errorLine1="    public void onChangeStarting(RecyclerView.ViewHolder item, boolean oldItem) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="441"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3197,9 +2617,7 @@
         errorLine1="    public void onChangeFinished(RecyclerView.ViewHolder item, boolean oldItem) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"
-            line="454"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/SimpleItemAnimator.java"/>
     </issue>
 
     <issue
@@ -3208,9 +2626,7 @@
         errorLine1="    public int[] calculateScrollDistance(int velocityX, int velocityY) {"
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SnapHelper.java"
-            line="136"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/SnapHelper.java"/>
     </issue>
 
     <issue
@@ -3219,9 +2635,7 @@
         errorLine1="    public abstract View findSnapView(RecyclerView.LayoutManager layoutManager);"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SnapHelper.java"
-            line="289"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/SnapHelper.java"/>
     </issue>
 
     <issue
@@ -3230,9 +2644,7 @@
         errorLine1="    public abstract int findTargetSnapPosition(RecyclerView.LayoutManager layoutManager, int velocityX,"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SnapHelper.java"
-            line="302"
-            column="48"/>
+            file="src/main/java/androidx/recyclerview/widget/SnapHelper.java"/>
     </issue>
 
     <issue
@@ -3241,9 +2653,7 @@
         errorLine1="        public void onChanged(int position, int count, Object payload) {"
         errorLine2="                                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SortedList.java"
-            line="865"
-            column="56"/>
+            file="src/main/java/androidx/recyclerview/widget/SortedList.java"/>
     </issue>
 
     <issue
@@ -3252,9 +2662,7 @@
         errorLine1="        public BatchedCallback(Callback&lt;T2> wrappedCallback) {"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SortedList.java"
-            line="951"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/SortedList.java"/>
     </issue>
 
     <issue
@@ -3263,9 +2671,7 @@
         errorLine1="        public void onChanged(int position, int count, Object payload) {"
         errorLine2="                                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SortedList.java"
-            line="982"
-            column="56"/>
+            file="src/main/java/androidx/recyclerview/widget/SortedList.java"/>
     </issue>
 
     <issue
@@ -3274,9 +2680,7 @@
         errorLine1="    public SortedListAdapterCallback(RecyclerView.Adapter adapter) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SortedListAdapterCallback.java"
-            line="33"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/SortedListAdapterCallback.java"/>
     </issue>
 
     <issue
@@ -3285,9 +2689,7 @@
         errorLine1="    public void onChanged(int position, int count, Object payload) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/SortedListAdapterCallback.java"
-            line="58"
-            column="52"/>
+            file="src/main/java/androidx/recyclerview/widget/SortedListAdapterCallback.java"/>
     </issue>
 
     <issue
@@ -3296,9 +2698,7 @@
         errorLine1="    public StaggeredGridLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="227"
-            column="39"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3307,9 +2707,7 @@
         errorLine1="    public StaggeredGridLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,"
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="227"
-            column="56"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3318,9 +2716,7 @@
         errorLine1="    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {"
         errorLine2="                                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="321"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3329,9 +2725,7 @@
         errorLine1="    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="321"
-            column="57"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3340,9 +2734,7 @@
         errorLine1="    public void assertNotInLayoutOrScroll(String message) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="526"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3351,9 +2743,7 @@
         errorLine1="    public void setMeasuredDimension(Rect childrenBounds, int wSpec, int hSpec) {"
         errorLine2="                                     ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="583"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3362,9 +2752,7 @@
         errorLine1="    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="603"
-            column="34"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3373,9 +2761,7 @@
         errorLine1="    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="603"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3384,9 +2770,7 @@
         errorLine1="    public void onLayoutCompleted(RecyclerView.State state) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="733"
-            column="35"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3395,9 +2779,7 @@
         errorLine1="    public int[] findFirstVisibleItemPositions(int[] into) {"
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="965"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3406,9 +2788,7 @@
         errorLine1="    public int[] findFirstVisibleItemPositions(int[] into) {"
         errorLine2="                                               ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="965"
-            column="48"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3417,9 +2797,7 @@
         errorLine1="    public int[] findFirstCompletelyVisibleItemPositions(int[] into) {"
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="997"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3428,9 +2806,7 @@
         errorLine1="    public int[] findFirstCompletelyVisibleItemPositions(int[] into) {"
         errorLine2="                                                         ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="997"
-            column="58"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3439,9 +2815,7 @@
         errorLine1="    public int[] findLastVisibleItemPositions(int[] into) {"
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1029"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3450,9 +2824,7 @@
         errorLine1="    public int[] findLastVisibleItemPositions(int[] into) {"
         errorLine2="                                              ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1029"
-            column="47"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3461,9 +2833,7 @@
         errorLine1="    public int[] findLastCompletelyVisibleItemPositions(int[] into) {"
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1061"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3472,9 +2842,7 @@
         errorLine1="    public int[] findLastCompletelyVisibleItemPositions(int[] into) {"
         errorLine2="                                                        ~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1061"
-            column="57"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3483,9 +2851,7 @@
         errorLine1="    public int computeHorizontalScrollOffset(RecyclerView.State state) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1075"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3494,9 +2860,7 @@
         errorLine1="    public int computeVerticalScrollOffset(RecyclerView.State state) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1090"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3505,9 +2869,7 @@
         errorLine1="    public int computeHorizontalScrollExtent(RecyclerView.State state) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1095"
-            column="46"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3516,9 +2878,7 @@
         errorLine1="    public int computeVerticalScrollExtent(RecyclerView.State state) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1110"
-            column="44"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3527,9 +2887,7 @@
         errorLine1="    public int computeHorizontalScrollRange(RecyclerView.State state) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1115"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3538,9 +2896,7 @@
         errorLine1="    public int computeVerticalScrollRange(RecyclerView.State state) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1130"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3549,9 +2905,7 @@
         errorLine1="    public void onRestoreInstanceState(Parcelable state) {"
         errorLine2="                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1229"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3560,9 +2914,7 @@
         errorLine1="    public Parcelable onSaveInstanceState() {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1243"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3571,9 +2923,7 @@
         errorLine1="    public void onInitializeAccessibilityEvent(AccessibilityEvent event) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1293"
-            column="48"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3582,9 +2932,7 @@
         errorLine1="    public void onItemsRemoved(RecyclerView recyclerView, int positionStart, int itemCount) {"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1475"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3593,9 +2941,7 @@
         errorLine1="    public void onItemsAdded(RecyclerView recyclerView, int positionStart, int itemCount) {"
         errorLine2="                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1480"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3604,9 +2950,7 @@
         errorLine1="    public void onItemsChanged(RecyclerView recyclerView) {"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1485"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3615,9 +2959,7 @@
         errorLine1="    public void onItemsMoved(RecyclerView recyclerView, int from, int to, int itemCount) {"
         errorLine2="                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1491"
-            column="30"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3626,9 +2968,7 @@
         errorLine1="    public void onItemsUpdated(RecyclerView recyclerView, int positionStart, int itemCount,"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1496"
-            column="32"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3637,9 +2977,7 @@
         errorLine1="            Object payload) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="1497"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3648,9 +2986,7 @@
         errorLine1="    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler,"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2005"
-            column="45"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3659,9 +2995,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2006"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3670,9 +3004,7 @@
         errorLine1="    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler,"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2011"
-            column="43"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3681,9 +3013,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2012"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3692,9 +3022,7 @@
         errorLine1="    public PointF computeScrollVectorForPosition(int targetPosition) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2025"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3703,9 +3031,7 @@
         errorLine1="    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2042"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3714,9 +3040,7 @@
         errorLine1="    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2042"
-            column="67"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3725,9 +3049,7 @@
         errorLine1="    public void collectAdjacentPrefetchPositions(int dx, int dy, RecyclerView.State state,"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2084"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3736,9 +3058,7 @@
         errorLine1="            LayoutPrefetchRegistry layoutPrefetchRegistry) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2085"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3747,9 +3067,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateDefaultLayoutParams() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2221"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3758,9 +3076,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2232"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3769,9 +3085,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                                          ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2232"
-            column="59"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3780,9 +3094,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                                                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2232"
-            column="70"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3791,9 +3103,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2237"
-            column="12"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3802,9 +3112,7 @@
         errorLine1="    public RecyclerView.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2237"
-            column="59"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3813,9 +3121,7 @@
         errorLine1="    public boolean checkLayoutParams(RecyclerView.LayoutParams lp) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2246"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3824,9 +3130,7 @@
         errorLine1="    public View onFocusSearchFailed(View focused, int direction, RecyclerView.Recycler recycler,"
         errorLine2="                                    ~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2256"
-            column="37"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3835,9 +3139,7 @@
         errorLine1="    public View onFocusSearchFailed(View focused, int direction, RecyclerView.Recycler recycler,"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2256"
-            column="66"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3846,9 +3148,7 @@
         errorLine1="            RecyclerView.State state) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2257"
-            column="13"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3857,9 +3157,7 @@
         errorLine1="        public LayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                            ~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2423"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3868,9 +3166,7 @@
         errorLine1="        public LayoutParams(Context c, AttributeSet attrs) {"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2423"
-            column="40"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3879,9 +3175,7 @@
         errorLine1="        public LayoutParams(ViewGroup.MarginLayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2431"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3890,9 +3184,7 @@
         errorLine1="        public LayoutParams(ViewGroup.LayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2435"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3901,9 +3193,7 @@
         errorLine1="        public LayoutParams(RecyclerView.LayoutParams source) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="2439"
-            column="29"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3912,9 +3202,7 @@
         errorLine1="        public SavedState(SavedState other) {"
         errorLine2="                          ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="3164"
-            column="27"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3923,9 +3211,7 @@
         errorLine1="        public void writeToParcel(Parcel dest, int flags) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"
-            line="3198"
-            column="35"/>
+            file="src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java"/>
     </issue>
 
     <issue
@@ -3934,9 +3220,7 @@
         errorLine1="        void addTile(int generation, TileList.Tile&lt;T> tile);"
         errorLine2="                                     ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ThreadUtil.java"
-            line="25"
-            column="38"/>
+            file="src/main/java/androidx/recyclerview/widget/ThreadUtil.java"/>
     </issue>
 
     <issue
@@ -3945,9 +3229,7 @@
         errorLine1="        void recycleTile(TileList.Tile&lt;T> tile);"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/ThreadUtil.java"
-            line="39"
-            column="26"/>
+            file="src/main/java/androidx/recyclerview/widget/ThreadUtil.java"/>
     </issue>
 
     <issue
@@ -3956,9 +3238,7 @@
         errorLine1="        public Tile(Class&lt;T> klass, int size) {"
         errorLine2="                    ~~~~~~~~">
         <location
-            file="src/main/java/androidx/recyclerview/widget/TileList.java"
-            line="99"
-            column="21"/>
+            file="src/main/java/androidx/recyclerview/widget/TileList.java"/>
     </issue>
 
 </issues>
diff --git a/remotecallback/processor/lint-baseline.xml b/remotecallback/processor/lint-baseline.xml
index 3268313..0823dcd 100644
--- a/remotecallback/processor/lint-baseline.xml
+++ b/remotecallback/processor/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/remotecallback/compiler/RemoteCallbackProcessor.java"
-            line="54"
-            column="5"/>
+            file="src/main/java/androidx/remotecallback/compiler/RemoteCallbackProcessor.java"/>
     </issue>
 
 </issues>
diff --git a/remotecallback/remotecallback/lint-baseline.xml b/remotecallback/remotecallback/lint-baseline.xml
index 30c9bd4..9fc3f41 100644
--- a/remotecallback/remotecallback/lint-baseline.xml
+++ b/remotecallback/remotecallback/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public static final RemoteCallback LOCAL = new RemoteCallback(null, -1, null, null, null) {"
         errorLine2="                                                                        ~~">
         <location
-            file="src/main/java/androidx/remotecallback/RemoteCallback.java"
-            line="152"
-            column="73"/>
+            file="src/main/java/androidx/remotecallback/RemoteCallback.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            Class&lt;? extends CallbackReceiver> cls, Bundle args, String method) {"
         errorLine2="                                                                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="200"
-            column="65"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public T createRemoteCallback(Context context) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"
-            line="50"
-            column="35"/>
+            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"
-            line="59"
-            column="12"/>
+            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"
-            line="59"
-            column="44"/>
+            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"
-            line="59"
-            column="58"/>
+            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"
-            line="59"
-            column="75"/>
+            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            Bundle args, String method) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"
-            line="60"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            Bundle args, String method) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"
-            line="60"
-            column="26"/>
+            file="src/main/java/androidx/remotecallback/AppWidgetProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public T createRemoteCallback(Context context) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"
-            line="56"
-            column="35"/>
+            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"
-            line="65"
-            column="12"/>
+            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"
-            line="65"
-            column="44"/>
+            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"
-            line="65"
-            column="58"/>
+            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"
-            line="65"
-            column="75"/>
+            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="            Bundle args, String method) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"
-            line="66"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="            Bundle args, String method) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"
-            line="66"
-            column="26"/>
+            file="src/main/java/androidx/remotecallback/BroadcastReceiverWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority, Bundle args,"
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackBase.java"
-            line="42"
-            column="5"/>
+            file="src/main/java/androidx/remotecallback/CallbackBase.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority, Bundle args,"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackBase.java"
-            line="42"
-            column="37"/>
+            file="src/main/java/androidx/remotecallback/CallbackBase.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority, Bundle args,"
         errorLine2="                                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackBase.java"
-            line="42"
-            column="51"/>
+            file="src/main/java/androidx/remotecallback/CallbackBase.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority, Bundle args,"
         errorLine2="                                                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackBase.java"
-            line="42"
-            column="68"/>
+            file="src/main/java/androidx/remotecallback/CallbackBase.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority, Bundle args,"
         errorLine2="                                                                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackBase.java"
-            line="42"
-            column="86"/>
+            file="src/main/java/androidx/remotecallback/CallbackBase.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="            String method);"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackBase.java"
-            line="43"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/CallbackBase.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public &lt;T extends CallbackReceiver> T getAndResetStub(Class&lt;? extends CallbackReceiver> cls,"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="55"
-            column="59"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="            Context context, String authority) {"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="56"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="            Context context, String authority) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="56"
-            column="30"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public &lt;T extends CallbackReceiver> void invokeCallback(Context context, T receiver,"
         errorLine2="                                                            ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="102"
-            column="61"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="            Intent intent) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="103"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public &lt;T extends CallbackReceiver> void invokeCallback(Context context, T receiver,"
         errorLine2="                                                            ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="111"
-            column="61"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="            Bundle bundle) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="112"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    public static &lt;T extends CallbackReceiver> void registerCallbackHandler(Class&lt;T> cls,"
         errorLine2="                                                                            ~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="188"
-            column="77"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="            String method, CallbackHandler&lt;T> handler) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="189"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="            String method, CallbackHandler&lt;T> handler) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="189"
-            column="28"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    public static RemoteCallback stubToRemoteCallback(CallbackReceiver receiver,"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="199"
-            column="19"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public static RemoteCallback stubToRemoteCallback(CallbackReceiver receiver,"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="199"
-            column="55"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="            Class&lt;? extends CallbackReceiver> cls, Bundle args, String method) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="200"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="            Class&lt;? extends CallbackReceiver> cls, Bundle args, String method) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="200"
-            column="52"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="            Class&lt;? extends CallbackReceiver> cls, Bundle args, String method) {"
         errorLine2="                                                                ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="200"
-            column="65"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="        void executeCallback(Context context, T receiver, Bundle arguments);"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="235"
-            column="30"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="        void executeCallback(Context context, T receiver, Bundle arguments);"
         errorLine2="                                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"
-            line="235"
-            column="59"/>
+            file="src/main/java/androidx/remotecallback/CallbackHandlerRegistry.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    T createRemoteCallback(Context context);"
         errorLine2="                           ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/CallbackReceiver.java"
-            line="107"
-            column="28"/>
+            file="src/main/java/androidx/remotecallback/CallbackReceiver.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="54"
-            column="12"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="54"
-            column="24"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="54"
-            column="39"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public Bundle call(String method, String arg, Bundle extras) {"
         errorLine2="                                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="54"
-            column="51"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public T createRemoteCallback(Context context) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="63"
-            column="35"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="72"
-            column="12"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="72"
-            column="44"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="72"
-            column="58"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public RemoteCallback toRemoteCallback(Class&lt;T> cls, Context context, String authority,"
         errorLine2="                                                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="72"
-            column="75"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="            Bundle args, String method) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="73"
-            column="13"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="            Bundle args, String method) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"
-            line="73"
-            column="26"/>
+            file="src/main/java/androidx/remotecallback/ContentProviderWithCallbacks.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    public String getMethodName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/RemoteCallback.java"
-            line="105"
-            column="12"/>
+            file="src/main/java/androidx/remotecallback/RemoteCallback.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="    public Bundle getArgumentBundle() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/RemoteCallback.java"
-            line="112"
-            column="12"/>
+            file="src/main/java/androidx/remotecallback/RemoteCallback.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public PendingIntent toPendingIntent() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/RemoteCallback.java"
-            line="119"
-            column="12"/>
+            file="src/main/java/androidx/remotecallback/RemoteCallback.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    public static &lt;T extends CallbackReceiver> T create(Class&lt;T> cls, Context context) {"
         errorLine2="                                                        ~~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/RemoteCallback.java"
-            line="145"
-            column="57"/>
+            file="src/main/java/androidx/remotecallback/RemoteCallback.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public static &lt;T extends CallbackReceiver> T create(Class&lt;T> cls, Context context) {"
         errorLine2="                                                                      ~~~~~~~">
         <location
-            file="src/main/java/androidx/remotecallback/RemoteCallback.java"
-            line="145"
-            column="71"/>
+            file="src/main/java/androidx/remotecallback/RemoteCallback.java"/>
     </issue>
 
 </issues>
diff --git a/room/integration-tests/testapp/lint-baseline.xml b/room/integration-tests/testapp/lint-baseline.xml
index 26bee27..fbc298f 100644
--- a/room/integration-tests/testapp/lint-baseline.xml
+++ b/room/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            throw new AssertionError(&quot;interrupted&quot;, e);"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java"
-            line="290"
-            column="19"/>
+            file="src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            throw new AssertionError(&quot;drain timed out&quot;, e);"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java"
-            line="292"
-            column="19"/>
+            file="src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            throw new AssertionError(&quot;interrupted&quot;, e);"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java"
-            line="327"
-            column="19"/>
+            file="src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            throw new AssertionError(&quot;execution error&quot;, e);"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java"
-            line="329"
-            column="19"/>
+            file="src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void abstractDao() {"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/integration/testapp/test/DefaultDaoMethodsTest.java"
-            line="117"
-            column="17"/>
+            file="src/androidTest/java/androidx/room/integration/testapp/test/DefaultDaoMethodsTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public void interfaceDao() {"
         errorLine2="                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/integration/testapp/test/DefaultDaoMethodsTest.java"
-            line="133"
-            column="17"/>
+            file="src/androidTest/java/androidx/room/integration/testapp/test/DefaultDaoMethodsTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            mDatabase.getCustomerDao().insert(customer);"
         errorLine2="            ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"
-            line="58"
-            column="13"/>
+            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            final LiveData&lt;List&lt;Customer>> customers = mDatabase.getCustomerDao().all();"
         errorLine2="                                                       ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"
-            line="73"
-            column="56"/>
+            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public String getName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Customer.java"
-            line="45"
-            column="12"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Customer.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public void setName(String name) {"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Customer.java"
-            line="49"
-            column="25"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Customer.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public String getLastName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Customer.java"
-            line="53"
-            column="12"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Customer.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public void setLastName(String lastName) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Customer.java"
-            line="57"
-            column="29"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Customer.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    void insert(Customer customer);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"
-            line="37"
-            column="17"/>
+            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    void insertAll(Customer[] customers);"
         errorLine2="                   ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"
-            line="44"
-            column="20"/>
+            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    LiveData&lt;List&lt;Customer>> all();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"
-            line="56"
-            column="5"/>
+            file="src/main/java/androidx/room/integration/testapp/database/CustomerDao.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public Description(int productId, String text) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Description.java"
-            line="32"
-            column="39"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Description.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public String getText() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Description.java"
-            line="41"
-            column="12"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Description.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public Product(int id, String name) {"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Product.java"
-            line="38"
-            column="28"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Product.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public String getName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Product.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Product.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public void setName(String name) {"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/Product.java"
-            line="55"
-            column="25"/>
+            file="src/main/java/androidx/room/integration/testapp/database/Product.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    void insert(Product product);"
         errorLine2="                ~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/ProductDao.java"
-            line="35"
-            column="17"/>
+            file="src/main/java/androidx/room/integration/testapp/database/ProductDao.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    void addReview(Review review);"
         errorLine2="                   ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/ProductDao.java"
-            line="41"
-            column="20"/>
+            file="src/main/java/androidx/room/integration/testapp/database/ProductDao.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    List&lt;Review> getProductReviews(int productId);"
         errorLine2="    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/ProductDao.java"
-            line="47"
-            column="5"/>
+            file="src/main/java/androidx/room/integration/testapp/database/ProductDao.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    void addDescription(Description description);"
         errorLine2="                        ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/ProductFtsDao.java"
-            line="35"
-            column="25"/>
+            file="src/main/java/androidx/room/integration/testapp/database/ProductFtsDao.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    List&lt;Product> getProductsWithDescription(String query);"
         errorLine2="    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/ProductFtsDao.java"
-            line="42"
-            column="5"/>
+            file="src/main/java/androidx/room/integration/testapp/database/ProductFtsDao.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    List&lt;Product> getProductsWithDescription(String query);"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/ProductFtsDao.java"
-            line="42"
-            column="46"/>
+            file="src/main/java/androidx/room/integration/testapp/database/ProductFtsDao.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public abstract CustomerDao getCustomerDao();"
         errorLine2="                    ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/SampleDatabase.java"
-            line="31"
-            column="21"/>
+            file="src/main/java/androidx/room/integration/testapp/database/SampleDatabase.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public abstract ProductDao getProductDao();"
         errorLine2="                    ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/SampleDatabase.java"
-            line="36"
-            column="21"/>
+            file="src/main/java/androidx/room/integration/testapp/database/SampleDatabase.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    public static Intent intentFor(Context context, String databaseName) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"
-            line="99"
-            column="19"/>
+            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    public static Intent intentFor(Context context, String databaseName) {"
         errorLine2="                                   ~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"
-            line="99"
-            column="36"/>
+            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="    public static Intent intentFor(Context context, String databaseName) {"
         errorLine2="                                                    ~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"
-            line="99"
-            column="53"/>
+            file="src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    public abstract ProductFtsDao getProductDao();"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/integration/testapp/database/SampleFtsDatabase.java"
-            line="31"
-            column="21"/>
+            file="src/main/java/androidx/room/integration/testapp/database/SampleFtsDatabase.java"/>
     </issue>
 
 </issues>
diff --git a/room/room-guava/lint-baseline.xml b/room/room-guava/lint-baseline.xml
index 4ec46ff..8fc617b 100644
--- a/room/room-guava/lint-baseline.xml
+++ b/room/room-guava/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            final boolean releaseQuery) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="59"
-            column="13"/>
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            final boolean releaseQuery) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="76"
-            column="13"/>
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            final @Nullable CancellationSignal cancellationSignal) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="107"
-            column="13"/>
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public static &lt;T> ListenableFuture&lt;T> createListenableFuture("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="86"
-            column="23"/>
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            final RoomDatabase roomDatabase,"
         errorLine2="                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="87"
-            column="19"/>
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            final Callable&lt;T> callable,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="89"
-            column="19"/>
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            final RoomSQLiteQuery query,"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/guava/GuavaRoom.java"
-            line="90"
-            column="19"/>
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
     </issue>
 
 </issues>
diff --git a/room/room-runtime/lint-baseline.xml b/room/room-runtime/lint-baseline.xml
index a6f41ea..47c8bc0 100644
--- a/room/room-runtime/lint-baseline.xml
+++ b/room/room-runtime/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        @NonNull cancellationSignal: CancellationSignal?"
         errorLine2="        ~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/QueryInterceptorDatabase.kt"
-            line="115"
-            column="9"/>
+            file="src/main/java/androidx/room/QueryInterceptorDatabase.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"
-            line="85"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"
-            line="85"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"
-            line="98"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"
-            line="98"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        val db = autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"
-            line="144"
-            column="44"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        val db = autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"
-            line="144"
-            column="44"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                .writableDatabase.query(&quot;select * from nonexistanttable&quot;)"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="88"
-            column="18"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                .writableDatabase.query(&quot;select * from nonexistanttable&quot;)"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="88"
-            column="18"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase.execSQL(&quot;create table user (idk int)&quot;)"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="97"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase.execSQL(&quot;create table user (idk int)&quot;)"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="97"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="            autoClosingRoomOpenHelper.writableDatabase.query(&quot;select * from user&quot;)"
         errorLine2="                                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="100"
-            column="39"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="            autoClosingRoomOpenHelper.writableDatabase.query(&quot;select * from user&quot;)"
         errorLine2="                                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="100"
-            column="39"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase.beginTransaction()"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="109"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase.beginTransaction()"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="109"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase.endTransaction()"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="111"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase.endTransaction()"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="111"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        assertThat(autoClosingRoomOpenHelper.writableDatabase.isWriteAheadLoggingEnabled).isTrue()"
         errorLine2="                                             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="121"
-            column="46"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        assertThat(autoClosingRoomOpenHelper.writableDatabase.isWriteAheadLoggingEnabled).isTrue()"
         errorLine2="                                             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="121"
-            column="46"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        assertThat(autoClosingRoomOpenHelper.writableDatabase.isWriteAheadLoggingEnabled).isTrue()"
         errorLine2="                                             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="125"
-            column="46"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="        assertThat(autoClosingRoomOpenHelper.writableDatabase.isWriteAheadLoggingEnabled).isTrue()"
         errorLine2="                                             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="125"
-            column="46"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="            autoClosingRoomOpenHelper.writableDatabase.enableWriteAheadLogging()"
         errorLine2="                                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="133"
-            column="39"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="            autoClosingRoomOpenHelper.writableDatabase.enableWriteAheadLogging()"
         errorLine2="                                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="133"
-            column="39"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="            autoClosingRoomOpenHelper.writableDatabase.disableWriteAheadLogging()"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="137"
-            column="56"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="            autoClosingRoomOpenHelper.writableDatabase.disableWriteAheadLogging()"
         errorLine2="                                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="137"
-            column="39"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="            autoClosingRoomOpenHelper.writableDatabase.disableWriteAheadLogging()"
         errorLine2="                                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="137"
-            column="39"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="161"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="161"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="166"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="        autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="166"
-            column="35"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="        val db = autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="175"
-            column="44"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="        val db = autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="175"
-            column="44"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="        val db = autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="189"
-            column="44"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="        val db = autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="189"
-            column="44"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="        val db = autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="209"
-            column="44"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="        val db = autoClosingRoomOpenHelper.writableDatabase"
         errorLine2="                                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"
-            line="209"
-            column="44"/>
+            file="src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="                .setJournalMode(RoomDatabase.JournalMode.WRITE_AHEAD_LOGGING).build();"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/room/BuilderTest.java"
-            line="411"
-            column="58"/>
+            file="src/test/java/androidx/room/BuilderTest.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="        assertThat(config.journalMode, is(RoomDatabase.JournalMode.WRITE_AHEAD_LOGGING));"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/room/BuilderTest.java"
-            line="414"
-            column="68"/>
+            file="src/test/java/androidx/room/BuilderTest.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="        Locale.setDefault(Locale.forLanguageTag(&quot;tr-TR&quot;));"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/room/InvalidationTrackerTest.java"
-            line="119"
-            column="34"/>
+            file="src/test/java/androidx/room/InvalidationTrackerTest.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="                val exited = it.waitFor(5, TimeUnit.SECONDS)"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/test/java/androidx/room/SQLiteCopyOpenHelperTest.kt"
-            line="130"
-            column="33"/>
+            file="src/test/java/androidx/room/SQLiteCopyOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="            .redirectOutput(ProcessBuilder.Redirect.INHERIT)"
         errorLine2="             ~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/room/SQLiteCopyOpenHelperTest.kt"
-            line="264"
-            column="14"/>
+            file="src/test/java/androidx/room/SQLiteCopyOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="            .redirectOutput(ProcessBuilder.Redirect.INHERIT)"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/test/java/androidx/room/SQLiteCopyOpenHelperTest.kt"
-            line="264"
-            column="29"/>
+            file="src/test/java/androidx/room/SQLiteCopyOpenHelperTest.kt"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"
-            line="91"
-            column="5"/>
+            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"
-            line="100"
-            column="5"/>
+            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"
-            line="109"
-            column="5"/>
+            file="src/main/java/androidx/room/SQLiteCopyOpenHelper.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/room/TransactionExecutor.java"
-            line="41"
-            column="5"/>
+            file="src/main/java/androidx/room/TransactionExecutor.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    @SuppressWarnings(&quot;WeakerAccess&quot;)"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/room/TransactionExecutor.java"
-            line="58"
-            column="5"/>
+            file="src/main/java/androidx/room/TransactionExecutor.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="public class Room {"
         errorLine2="             ~~~~">
         <location
-            file="src/main/java/androidx/room/Room.java"
-            line="28"
-            column="14"/>
+            file="src/main/java/androidx/room/Room.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="                MultiInstanceInvalidationService.class) : null,"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="513"
-            column="17"/>
+            file="src/main/java/androidx/room/DatabaseConfiguration.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="                    MultiInstanceInvalidationService.class) : null;"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomDatabase.java"
-            line="1172"
-            column="21"/>
+            file="src/main/java/androidx/room/RoomDatabase.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="            @Nullable Set&lt;Integer> migrationNotRequiredFrom) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="183"
-            column="13"/>
+            file="src/main/java/androidx/room/DatabaseConfiguration.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="            @Nullable Set&lt;Integer> migrationNotRequiredFrom) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="229"
-            column="13"/>
+            file="src/main/java/androidx/room/DatabaseConfiguration.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="            @Nullable File copyFromFile) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="279"
-            column="13"/>
+            file="src/main/java/androidx/room/DatabaseConfiguration.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public EntityDeletionOrUpdateAdapter(RoomDatabase database) {"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"
-            line="39"
-            column="42"/>
+            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    protected abstract String createQuery();"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"
-            line="49"
-            column="24"/>
+            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    protected abstract void bind(SupportSQLiteStatement statement, T entity);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"
-            line="58"
-            column="34"/>
+            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="    public final int handleMultiple(Iterable&lt;? extends T> entities) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"
-            line="82"
-            column="37"/>
+            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="    public final int handleMultiple(T[] entities) {"
         errorLine2="                                    ~~~">
         <location
-            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"
-            line="102"
-            column="37"/>
+            file="src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="    public EntityInsertionAdapter(RoomDatabase database) {"
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="42"
-            column="35"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="    protected abstract void bind(SupportSQLiteStatement statement, T entity);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="53"
-            column="34"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="    public final void insert(T[] entities) {"
         errorLine2="                             ~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="75"
-            column="30"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="    public final void insert(Iterable&lt;? extends T> entities) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="92"
-            column="30"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="    public final long[] insertAndReturnIdsArray(Collection&lt;? extends T> entities) {"
         errorLine2="                 ~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="126"
-            column="18"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="    public final long[] insertAndReturnIdsArray(Collection&lt;? extends T> entities) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="126"
-            column="49"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="    public final long[] insertAndReturnIdsArray(T[] entities) {"
         errorLine2="                 ~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="148"
-            column="18"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="    public final long[] insertAndReturnIdsArray(T[] entities) {"
         errorLine2="                                                ~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="148"
-            column="49"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="    public final Long[] insertAndReturnIdsArrayBox(Collection&lt;? extends T> entities) {"
         errorLine2="                 ~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="170"
-            column="18"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -744,9 +610,7 @@
         errorLine1="    public final Long[] insertAndReturnIdsArrayBox(Collection&lt;? extends T> entities) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="170"
-            column="52"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -755,9 +619,7 @@
         errorLine1="    public final Long[] insertAndReturnIdsArrayBox(T[] entities) {"
         errorLine2="                 ~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="192"
-            column="18"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -766,9 +628,7 @@
         errorLine1="    public final Long[] insertAndReturnIdsArrayBox(T[] entities) {"
         errorLine2="                                                   ~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="192"
-            column="52"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -777,9 +637,7 @@
         errorLine1="    public final List&lt;Long> insertAndReturnIdsList(T[] entities) {"
         errorLine2="                 ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="214"
-            column="18"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -788,9 +646,7 @@
         errorLine1="    public final List&lt;Long> insertAndReturnIdsList(T[] entities) {"
         errorLine2="                                                   ~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="214"
-            column="52"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -799,9 +655,7 @@
         errorLine1="    public final List&lt;Long> insertAndReturnIdsList(Collection&lt;? extends T> entities) {"
         errorLine2="                 ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="236"
-            column="18"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -810,9 +664,7 @@
         errorLine1="    public final List&lt;Long> insertAndReturnIdsList(Collection&lt;? extends T> entities) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/EntityInsertionAdapter.java"
-            line="236"
-            column="52"/>
+            file="src/main/java/androidx/room/EntityInsertionAdapter.java"/>
     </issue>
 
     <issue
@@ -821,9 +673,7 @@
         errorLine1="    public InvalidationTracker(RoomDatabase database, String... tableNames) {"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="127"
-            column="32"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -832,9 +682,7 @@
         errorLine1="    public InvalidationTracker(RoomDatabase database, String... tableNames) {"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="127"
-            column="55"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -843,9 +691,7 @@
         errorLine1="    public InvalidationTracker(RoomDatabase database, Map&lt;String, String> shadowTablesMap,"
         errorLine2="                               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="139"
-            column="32"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -854,9 +700,7 @@
         errorLine1="    public InvalidationTracker(RoomDatabase database, Map&lt;String, String> shadowTablesMap,"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="139"
-            column="55"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -865,9 +709,7 @@
         errorLine1="            Map&lt;String, Set&lt;String>> viewTables, String... tableNames) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="140"
-            column="13"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -876,9 +718,7 @@
         errorLine1="            Map&lt;String, Set&lt;String>> viewTables, String... tableNames) {"
         errorLine2="                                                 ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="140"
-            column="50"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -887,9 +727,7 @@
         errorLine1="    public void addWeakObserver(Observer observer) {"
         errorLine2="                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="362"
-            column="33"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -898,9 +736,7 @@
         errorLine1="    public void notifyObserversByTableNames(String... tables) {"
         errorLine2="                                            ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="526"
-            column="45"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -909,9 +745,7 @@
         errorLine1="    public &lt;T> LiveData&lt;T> createLiveData(String[] tableNames, boolean inTransaction,"
         errorLine2="               ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="633"
-            column="16"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -920,9 +754,7 @@
         errorLine1="    public &lt;T> LiveData&lt;T> createLiveData(String[] tableNames, boolean inTransaction,"
         errorLine2="                                          ~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="633"
-            column="43"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -931,9 +763,7 @@
         errorLine1="            Callable&lt;T> computeFunction) {"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="634"
-            column="13"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -942,9 +772,7 @@
         errorLine1="        protected Observer(@NonNull String firstTable, String... rest) {"
         errorLine2="                                                       ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="742"
-            column="56"/>
+            file="src/main/java/androidx/room/InvalidationTracker.java"/>
     </issue>
 
     <issue
@@ -953,9 +781,7 @@
         errorLine1="    protected abstract SupportSQLiteOpenHelper createOpenHelper(DatabaseConfiguration config);"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomDatabase.java"
-            line="367"
-            column="65"/>
+            file="src/main/java/androidx/room/RoomDatabase.java"/>
     </issue>
 
     <issue
@@ -964,9 +790,7 @@
         errorLine1="    public SupportSQLiteStatement compileStatement(@NonNull String sql) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomDatabase.java"
-            line="540"
-            column="12"/>
+            file="src/main/java/androidx/room/RoomDatabase.java"/>
     </issue>
 
     <issue
@@ -975,9 +799,7 @@
         errorLine1="        public Builder&lt;T> fallbackToDestructiveMigrationFrom(int... startVersions) {"
         errorLine2="                                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomDatabase.java"
-            line="1269"
-            column="62"/>
+            file="src/main/java/androidx/room/RoomDatabase.java"/>
     </issue>
 
     <issue
@@ -986,9 +808,7 @@
         errorLine1="    public void onConfigure(SupportSQLiteDatabase db) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="67"
-            column="29"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -997,9 +817,7 @@
         errorLine1="    public void onCreate(SupportSQLiteDatabase db) {"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="72"
-            column="26"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1008,9 +826,7 @@
         errorLine1="    public void onUpgrade(SupportSQLiteDatabase db, int oldVersion, int newVersion) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="91"
-            column="27"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1019,9 +835,7 @@
         errorLine1="    public void onDowngrade(SupportSQLiteDatabase db, int oldVersion, int newVersion) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="128"
-            column="29"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1030,9 +844,7 @@
         errorLine1="    public void onOpen(SupportSQLiteDatabase db) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="133"
-            column="24"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1041,9 +853,7 @@
         errorLine1="        protected abstract void dropAllTables(SupportSQLiteDatabase database);"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="214"
-            column="47"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1052,9 +862,7 @@
         errorLine1="        protected abstract void createAllTables(SupportSQLiteDatabase database);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="216"
-            column="49"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1063,9 +871,7 @@
         errorLine1="        protected abstract void onOpen(SupportSQLiteDatabase database);"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="218"
-            column="40"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1074,9 +880,7 @@
         errorLine1="        protected abstract void onCreate(SupportSQLiteDatabase database);"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="220"
-            column="42"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1085,9 +889,7 @@
         errorLine1="        protected void onPreMigrate(SupportSQLiteDatabase database) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="250"
-            column="37"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1096,9 +898,7 @@
         errorLine1="        protected void onPostMigrate(SupportSQLiteDatabase database) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomOpenHelper.java"
-            line="258"
-            column="38"/>
+            file="src/main/java/androidx/room/RoomOpenHelper.java"/>
     </issue>
 
     <issue
@@ -1107,9 +907,7 @@
         errorLine1="    public static RoomSQLiteQuery copyFrom(SupportSQLiteQuery supportSQLiteQuery) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="87"
-            column="19"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1118,9 +916,7 @@
         errorLine1="    public static RoomSQLiteQuery copyFrom(SupportSQLiteQuery supportSQLiteQuery) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="87"
-            column="44"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1129,9 +925,7 @@
         errorLine1="    public static RoomSQLiteQuery acquire(String query, int argumentCount) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="140"
-            column="19"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1140,9 +934,7 @@
         errorLine1="    public static RoomSQLiteQuery acquire(String query, int argumentCount) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="140"
-            column="43"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1151,9 +943,7 @@
         errorLine1="    public String getSql() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="200"
-            column="12"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1162,9 +952,7 @@
         errorLine1="    public void bindTo(SupportSQLiteProgram program) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="210"
-            column="24"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1173,9 +961,7 @@
         errorLine1="    public void bindString(int index, String value) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="250"
-            column="39"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1184,9 +970,7 @@
         errorLine1="    public void bindBlob(int index, byte[] value) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="256"
-            column="37"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1195,9 +979,7 @@
         errorLine1="    public void copyArgumentsFrom(RoomSQLiteQuery other) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/RoomSQLiteQuery.java"
-            line="271"
-            column="35"/>
+            file="src/main/java/androidx/room/RoomSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -1206,9 +988,7 @@
         errorLine1="    public SharedSQLiteStatement(RoomDatabase database) {"
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/SharedSQLiteStatement.java"
-            line="48"
-            column="34"/>
+            file="src/main/java/androidx/room/SharedSQLiteStatement.java"/>
     </issue>
 
     <issue
@@ -1217,9 +997,7 @@
         errorLine1="    protected abstract String createQuery();"
         errorLine2="                       ~~~~~~">
         <location
-            file="src/main/java/androidx/room/SharedSQLiteStatement.java"
-            line="57"
-            column="24"/>
+            file="src/main/java/androidx/room/SharedSQLiteStatement.java"/>
     </issue>
 
     <issue
@@ -1228,9 +1006,7 @@
         errorLine1="    public SupportSQLiteStatement acquire() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/SharedSQLiteStatement.java"
-            line="85"
-            column="12"/>
+            file="src/main/java/androidx/room/SharedSQLiteStatement.java"/>
     </issue>
 
     <issue
@@ -1239,9 +1015,7 @@
         errorLine1="    public void release(SupportSQLiteStatement statement) {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/SharedSQLiteStatement.java"
-            line="95"
-            column="25"/>
+            file="src/main/java/androidx/room/SharedSQLiteStatement.java"/>
     </issue>
 
 </issues>
diff --git a/room/room-rxjava2/lint-baseline.xml b/room/room-rxjava2/lint-baseline.xml
index 483de3c..605f43a 100644
--- a/room/room-rxjava2/lint-baseline.xml
+++ b/room/room-rxjava2/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="public class RxRoom {"
         errorLine2="             ~~~~~~">
         <location
-            file="src/main/java/androidx/room/RxRoom.java"
-            line="47"
-            column="14"/>
+            file="src/main/java/androidx/room/RxRoom.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public EmptyResultSetException(String message) {"
         errorLine2="                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/room/EmptyResultSetException.java"
-            line="33"
-            column="36"/>
+            file="src/main/java/androidx/room/EmptyResultSetException.java"/>
     </issue>
 
     <issue
diff --git a/room/room-testing/lint-baseline.xml b/room/room-testing/lint-baseline.xml
index 4095596..6bd249e 100644
--- a/room/room-testing/lint-baseline.xml
+++ b/room/room-testing/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    protected void starting(Description description) {"
         errorLine2="                            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="211"
-            column="29"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public SupportSQLiteDatabase createDatabase(String name, int version) throws IOException {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="228"
-            column="12"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public SupportSQLiteDatabase createDatabase(String name, int version) throws IOException {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="228"
-            column="49"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public SupportSQLiteDatabase runMigrationsAndValidate(String name, int version,"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="293"
-            column="12"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public SupportSQLiteDatabase runMigrationsAndValidate(String name, int version,"
         errorLine2="                                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="293"
-            column="59"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            boolean validateDroppedTables, Migration... migrations) throws IOException {"
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="294"
-            column="44"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    protected void finished(Description description) {"
         errorLine2="                            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="416"
-            column="29"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public void closeWhenFinished(SupportSQLiteDatabase db) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="443"
-            column="35"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public void closeWhenFinished(RoomDatabase db) {"
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="460"
-            column="35"/>
+            file="src/main/java/androidx/room/testing/MigrationTestHelper.java"/>
     </issue>
 
 </issues>
diff --git a/samples/Support4Demos/lint-baseline.xml b/samples/Support4Demos/lint-baseline.xml
index 066357f..ecf6f71 100644
--- a/samples/Support4Demos/lint-baseline.xml
+++ b/samples/Support4Demos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        this.mWifiLock = ((WifiManager) service.getSystemService(Context.WIFI_SERVICE))"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/Playback.java"
-            line="102"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/media/Playback.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            return ServiceCompat.START_STICKY;"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java"
-            line="152"
-            column="20"/>
+            file="src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="import java.util.concurrent.ConcurrentHashMap;"
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="37"
-            column="1"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public synchronized void updateMusic(String musicId, MediaMetadataCompat metadata) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="139"
-            column="5"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    private synchronized void buildListsByGenre() {"
         errorLine2="    ^">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="202"
-            column="5"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    private synchronized void retrieveMedia() {"
         errorLine2="    ^">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="219"
-            column="5"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                notificationManager.createNotificationChannel("
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="137"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                        new NotificationChannel(NOTIFICATION_CHANNEL_ID, TAG,"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="138"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                notificationManager.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="182"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                mSlidingLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/SlidingPaneLayoutActivity.java"
-            line="203"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv4/widget/SlidingPaneLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            getWindow().setStatusBarColor(0x80000000);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"
-            line="72"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="            getWindow().setNavigationBarColor(0x80000000);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"
-            line="73"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        &lt;meta-data"
         errorLine2="        ^">
         <location
-            file="src/main/AndroidManifest.xml"
-            line="494"
-            column="9"/>
+            file="src/main/AndroidManifest.xml"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        &lt;meta-data"
         errorLine2="        ^">
         <location
-            file="src/main/AndroidManifest.xml"
-            line="498"
-            column="9"/>
+            file="src/main/AndroidManifest.xml"/>
     </issue>
 
     <issue
@@ -168,9 +140,7 @@
         errorLine1="                    mCache.put(artUrl, bitmaps);"
         errorLine2="                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="105"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -179,9 +149,7 @@
         errorLine1="                Log.d(TAG, &quot;doInBackground: putting bitmap in cache. cache size=&quot; + mCache.size());"
         errorLine2="                                                                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="109"
-            column="85"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -190,9 +158,7 @@
         errorLine1="            if (itemIndex >= mMediaItems.size()) {"
         errorLine2="                             ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="89"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -201,9 +167,7 @@
         errorLine1="                mMediaItems.addAll(children);"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="94"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -212,9 +176,7 @@
         errorLine1="                    if (itemIndex &lt; mMediaItems.size()) {"
         errorLine2="                                    ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="98"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -223,9 +185,7 @@
         errorLine1="                        mMediaItems.set(itemIndex, item);"
         errorLine2="                        ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="99"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -234,9 +194,7 @@
         errorLine1="                        mMediaItems.add(item);"
         errorLine2="                        ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="101"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -245,9 +203,7 @@
         errorLine1="                    while (mMediaItems.size() > itemIndex) {"
         errorLine2="                           ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="109"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -256,9 +212,7 @@
         errorLine1="                        mMediaItems.remove(mMediaItems.size() - 1);"
         errorLine2="                        ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="110"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -267,9 +221,7 @@
         errorLine1="                        mMediaItems.remove(mMediaItems.size() - 1);"
         errorLine2="                                           ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="110"
-            column="44"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -278,9 +230,7 @@
         errorLine1="            mBrowserAdapter.notifyDataSetChanged();"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="114"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -289,9 +239,7 @@
         errorLine1="            mCanLoadNewPage = true;"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="115"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -300,9 +248,7 @@
         errorLine1="            mMediaItems.clear();"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="122"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -311,9 +257,7 @@
         errorLine1="            mMediaItems.addAll(children);"
         errorLine2="            ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="123"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -322,9 +266,7 @@
         errorLine1="            mBrowserAdapter.notifyDataSetChanged();"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="124"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -333,9 +275,7 @@
         errorLine1="            Log.d(TAG, &quot;onConnected: session token &quot; + mMediaBrowser.getSessionToken());"
         errorLine2="                                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="139"
-            column="56"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -344,9 +284,7 @@
         errorLine1="            if (mMediaBrowser.getSessionToken() == null) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="141"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -355,9 +293,7 @@
         errorLine1="                    mMediaBrowser.getSessionToken());"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="145"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -366,9 +302,7 @@
         errorLine1="            if (mMediaId == null) {"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="148"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -377,9 +311,7 @@
         errorLine1="                mMediaId = mMediaBrowser.getRoot();"
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="149"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -388,9 +320,7 @@
         errorLine1="                mMediaId = mMediaBrowser.getRoot();"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="149"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -399,9 +329,7 @@
         errorLine1="            if (mMediaItems.size() == 0) {"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="152"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -410,9 +338,7 @@
         errorLine1="                loadPage(0);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="153"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -421,9 +347,7 @@
         errorLine1="                MediaBrowserCompat.MediaItem item = mBrowserAdapter.getItem(position);"
         errorLine2="                                                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="192"
-            column="53"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -432,9 +356,7 @@
         errorLine1="                if (mCanLoadNewPage &amp;&amp; firstVisibleItem + visibleItemCount == totalItemCount) {"
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="213"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -443,9 +365,7 @@
         errorLine1="                    mCanLoadNewPage = false;"
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="214"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -454,9 +374,7 @@
         errorLine1="                    loadPage((mMediaItems.size() + PAGE_SIZE - 1) / PAGE_SIZE);"
         errorLine2="                              ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="215"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -465,9 +383,7 @@
         errorLine1="                    loadPage((mMediaItems.size() + PAGE_SIZE - 1) / PAGE_SIZE);"
         errorLine2="                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="215"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -476,9 +392,7 @@
         errorLine1="                                CommitContentSupport.this.onCommitContent("
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java"
-            line="218"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java"/>
     </issue>
 
     <issue
@@ -487,9 +401,7 @@
         errorLine1="                        clearTint();"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java"
-            line="59"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java"/>
     </issue>
 
     <issue
@@ -498,9 +410,7 @@
         errorLine1="                        setColorTint();"
         errorLine2="                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java"
-            line="62"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java"/>
     </issue>
 
     <issue
@@ -509,9 +419,7 @@
         errorLine1="                        setColorStateListTint();"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java"
-            line="65"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java"/>
     </issue>
 
     <issue
@@ -520,9 +428,7 @@
         errorLine1="            item.mId = mItems.size();"
         errorLine2="                 ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="160"
-            column="18"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -531,9 +437,7 @@
         errorLine1="            item.mBounds = new RectF(left, top, right, bottom);"
         errorLine2="                 ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="161"
-            column="18"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -542,9 +446,7 @@
         errorLine1="            item.mDescription = description;"
         errorLine2="                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="162"
-            column="18"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -553,9 +455,7 @@
         errorLine1="            item.mChecked = false;"
         errorLine2="                 ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="163"
-            column="18"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -564,9 +464,7 @@
         errorLine1="            item.mParent = parent;"
         errorLine2="                 ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="175"
-            column="18"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -575,9 +473,7 @@
         errorLine1="            parent.mChildren.add(item.mId);"
         errorLine2="                   ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="176"
-            column="20"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -586,9 +482,7 @@
         errorLine1="            parent.mChildren.add(item.mId);"
         errorLine2="                                      ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="176"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -597,9 +491,7 @@
         errorLine1="            item.mBoundsInRoot = new RectF(item.mBounds);"
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="189"
-            column="18"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -608,9 +500,7 @@
         errorLine1="            item.mBoundsInRoot = new RectF(item.mBounds);"
         errorLine2="                                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="189"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -619,9 +509,7 @@
         errorLine1="            CustomItem parent = item.mParent;"
         errorLine2="                                     ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="190"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -630,9 +518,7 @@
         errorLine1="                RectF bounds = item.mBoundsInRoot;"
         errorLine2="                                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="192"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -641,9 +527,7 @@
         errorLine1="                item.mBoundsInRoot.set(parent.mBounds.left + bounds.left * parent.mBounds.width(),"
         errorLine2="                     ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="193"
-            column="22"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -652,9 +536,7 @@
         errorLine1="                item.mBoundsInRoot.set(parent.mBounds.left + bounds.left * parent.mBounds.width(),"
         errorLine2="                                              ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="193"
-            column="47"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -663,9 +545,7 @@
         errorLine1="                item.mBoundsInRoot.set(parent.mBounds.left + bounds.left * parent.mBounds.width(),"
         errorLine2="                                                                                  ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="193"
-            column="83"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -674,9 +554,7 @@
         errorLine1="                        parent.mBounds.top + bounds.top * parent.mBounds.height(),"
         errorLine2="                               ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="194"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -685,9 +563,7 @@
         errorLine1="                        parent.mBounds.top + bounds.top * parent.mBounds.height(),"
         errorLine2="                                                                 ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="194"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -696,9 +572,7 @@
         errorLine1="                        parent.mBounds.left + bounds.right * parent.mBounds.width(),"
         errorLine2="                               ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="195"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -707,9 +581,7 @@
         errorLine1="                        parent.mBounds.left + bounds.right * parent.mBounds.width(),"
         errorLine2="                                                                    ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="195"
-            column="69"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -718,9 +590,7 @@
         errorLine1="                        parent.mBounds.top + bounds.bottom * parent.mBounds.height());"
         errorLine2="                               ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="196"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -729,9 +599,7 @@
         errorLine1="                        parent.mBounds.top + bounds.bottom * parent.mBounds.height());"
         errorLine2="                                                                    ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="196"
-            column="69"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -740,9 +608,7 @@
         errorLine1="                parent = parent.mParent;"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="197"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -751,9 +617,7 @@
         errorLine1="                if (item.mParent == null) {"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="211"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -762,9 +626,7 @@
         errorLine1="                    paint.setColor(item.mChecked ? Color.RED : Color.BLUE);"
         errorLine2="                                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="212"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -773,9 +635,7 @@
         errorLine1="                    paint.setColor(item.mChecked ? Color.MAGENTA : Color.GREEN);"
         errorLine2="                                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="214"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -784,9 +644,7 @@
         errorLine1="                scaleRectF(item.mBoundsInRoot, bounds, width, height);"
         errorLine2="                                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="217"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -795,9 +653,7 @@
         errorLine1="                canvas.drawText(item.mDescription, bounds.centerX(), bounds.centerY(), paint);"
         errorLine2="                                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="221"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -806,9 +662,7 @@
         errorLine1="            item.mChecked = !item.mChecked;"
         errorLine2="                 ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="231"
-            column="18"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -817,9 +671,7 @@
         errorLine1="            item.mChecked = !item.mChecked;"
         errorLine2="                                  ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="231"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -828,9 +680,7 @@
         errorLine1="                if (item.mBoundsInRoot.contains(scaledX, scaledY)) {"
         errorLine2="                         ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="256"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -839,9 +689,7 @@
         errorLine1="                final int n = mItems.size();"
         errorLine2="                              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="304"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -850,9 +698,7 @@
         errorLine1="                    if (mItems.get(i).mParent == null) {"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="306"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -861,9 +707,7 @@
         errorLine1="                    if (mItems.get(i).mParent == null) {"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="306"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -872,9 +716,7 @@
         errorLine1="                event.getText().add(item.mDescription);"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="325"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -883,9 +725,7 @@
         errorLine1="                node.setText(item.mDescription);"
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="338"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -894,9 +734,7 @@
         errorLine1="                if (item.mParent != null) {"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="347"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -905,9 +743,7 @@
         errorLine1="                    width = (int) (width * item.mParent.mBoundsInRoot.width());"
         errorLine2="                                                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="348"
-            column="57"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -916,9 +752,7 @@
         errorLine1="                    width = (int) (width * item.mParent.mBoundsInRoot.width());"
         errorLine2="                                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="348"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -927,9 +761,7 @@
         errorLine1="                    height = (int) (height * item.mParent.mBoundsInRoot.height());"
         errorLine2="                                                          ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="349"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -938,9 +770,7 @@
         errorLine1="                    height = (int) (height * item.mParent.mBoundsInRoot.height());"
         errorLine2="                                                  ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="349"
-            column="51"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -949,9 +779,7 @@
         errorLine1="                scaleRectF(item.mBounds, bounds, width, height);"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="351"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -960,9 +788,7 @@
         errorLine1="                node.setChecked(item.mChecked);"
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="360"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -971,9 +797,7 @@
         errorLine1="                if (item.mParent != null) {"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="363"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -982,9 +806,7 @@
         errorLine1="                    node.setParent(CustomView.this, item.mParent.mId);"
         errorLine2="                                                                 ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="364"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -993,9 +815,7 @@
         errorLine1="                    node.setParent(CustomView.this, item.mParent.mId);"
         errorLine2="                                                         ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="364"
-            column="58"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -1004,9 +824,7 @@
         errorLine1="                for (Integer id : item.mChildren) {"
         errorLine2="                                       ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="366"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -1015,9 +833,7 @@
         errorLine1="                    Editable text = (Editable)mResults.getText();"
         errorLine2="                                              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="88"
-            column="47"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -1026,9 +842,7 @@
         errorLine1="                    info.clss.getName());"
         errorLine2="                         ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="150"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -1037,9 +851,7 @@
         errorLine1="            fragment.setArguments(info.args);"
         errorLine2="                                       ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="151"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -1048,9 +860,7 @@
         errorLine1="    private DelayedStopHandler mDelayedStopHandler = new DelayedStopHandler(this);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="141"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1059,9 +869,7 @@
         errorLine1="        mSession.setCallback(new MediaSessionCallback());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="161"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1070,9 +878,7 @@
         errorLine1="                        loadChildrenImpl(parentMediaId, result, options);"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="264"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1081,9 +887,7 @@
         errorLine1="                        updatePlaybackState(getString(R.string.error_no_metadata));"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="266"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1092,9 +896,7 @@
         errorLine1="            if (mPlayingQueue == null || mPlayingQueue.isEmpty()) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="373"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1103,9 +905,7 @@
         errorLine1="            if (mPlayingQueue == null || mPlayingQueue.isEmpty()) {"
         errorLine2="                                         ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="373"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1114,9 +914,7 @@
         errorLine1="                mPlayingQueue = QueueHelper.getRandomQueue(mMusicProvider);"
         errorLine2="                                                           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="374"
-            column="60"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1125,9 +923,7 @@
         errorLine1="                mPlayingQueue = QueueHelper.getRandomQueue(mMusicProvider);"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="374"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1136,9 +932,7 @@
         errorLine1="                mSession.setQueue(mPlayingQueue);"
         errorLine2="                                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="375"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1147,9 +941,7 @@
         errorLine1="                mSession.setQueue(mPlayingQueue);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="375"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1158,9 +950,7 @@
         errorLine1="                mSession.setQueueTitle(getString(R.string.random_queue_title));"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="376"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1169,9 +959,7 @@
         errorLine1="                mCurrentIndexOnQueue = 0;"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="378"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1180,9 +968,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; !mPlayingQueue.isEmpty()) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="381"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1191,9 +977,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; !mPlayingQueue.isEmpty()) {"
         errorLine2="                                          ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="381"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1202,9 +986,7 @@
         errorLine1="                handlePlayRequest();"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="382"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1213,9 +995,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; !mPlayingQueue.isEmpty()) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="390"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1224,9 +1004,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; !mPlayingQueue.isEmpty()) {"
         errorLine2="                                          ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="390"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1235,9 +1013,7 @@
         errorLine1="                mCurrentIndexOnQueue = QueueHelper.getMusicIndexOnQueue(mPlayingQueue, queueId);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="392"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1246,9 +1022,7 @@
         errorLine1="                mCurrentIndexOnQueue = QueueHelper.getMusicIndexOnQueue(mPlayingQueue, queueId);"
         errorLine2="                                                                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="392"
-            column="73"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1257,9 +1031,7 @@
         errorLine1="                handlePlayRequest();"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="394"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1268,9 +1040,7 @@
         errorLine1="            mPlayback.seekTo((int) position);"
         errorLine2="            ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="401"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1279,9 +1049,7 @@
         errorLine1="            mPlayingQueue = QueueHelper.getPlayingQueue(mediaId, mMusicProvider);"
         errorLine2="                                                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="413"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1290,9 +1058,7 @@
         errorLine1="            mPlayingQueue = QueueHelper.getPlayingQueue(mediaId, mMusicProvider);"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="413"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1301,9 +1067,7 @@
         errorLine1="            mSession.setQueue(mPlayingQueue);"
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="414"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1312,9 +1076,7 @@
         errorLine1="            mSession.setQueue(mPlayingQueue);"
         errorLine2="            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="414"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1323,9 +1085,7 @@
         errorLine1="            mSession.setQueueTitle(queueTitle);"
         errorLine2="            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="417"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1334,9 +1094,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; !mPlayingQueue.isEmpty()) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="419"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1345,9 +1103,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; !mPlayingQueue.isEmpty()) {"
         errorLine2="                                          ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="419"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1356,9 +1112,7 @@
         errorLine1="                mCurrentIndexOnQueue = QueueHelper.getMusicIndexOnQueue(mPlayingQueue, mediaId);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="421"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1367,9 +1121,7 @@
         errorLine1="                mCurrentIndexOnQueue = QueueHelper.getMusicIndexOnQueue(mPlayingQueue, mediaId);"
         errorLine2="                                                                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="421"
-            column="73"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1378,9 +1130,7 @@
         errorLine1="                if (mCurrentIndexOnQueue &lt; 0) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="423"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1389,9 +1139,7 @@
         errorLine1="                    handlePlayRequest();"
         errorLine2="                    ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="428"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1400,9 +1148,7 @@
         errorLine1="            Log.d(TAG, &quot;pause. current state=&quot; + mPlayback.getState());"
         errorLine2="                                                 ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="435"
-            column="50"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1411,9 +1157,7 @@
         errorLine1="            handlePauseRequest();"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="436"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1422,9 +1166,7 @@
         errorLine1="            Log.d(TAG, &quot;stop. current state=&quot; + mPlayback.getState());"
         errorLine2="                                                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="441"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1433,9 +1175,7 @@
         errorLine1="            handleStopRequest(null);"
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="442"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1444,9 +1184,7 @@
         errorLine1="            mCurrentIndexOnQueue++;"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="448"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1455,9 +1193,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; mCurrentIndexOnQueue >= mPlayingQueue.size()) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="449"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1466,9 +1202,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; mCurrentIndexOnQueue >= mPlayingQueue.size()) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="449"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1477,9 +1211,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; mCurrentIndexOnQueue >= mPlayingQueue.size()) {"
         errorLine2="                                                                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="449"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1488,9 +1220,7 @@
         errorLine1="                mCurrentIndexOnQueue = 0;"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="452"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1499,9 +1229,7 @@
         errorLine1="            if (QueueHelper.isIndexPlayable(mCurrentIndexOnQueue, mPlayingQueue)) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="454"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1510,9 +1238,7 @@
         errorLine1="            if (QueueHelper.isIndexPlayable(mCurrentIndexOnQueue, mPlayingQueue)) {"
         errorLine2="                                                                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="454"
-            column="67"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1521,9 +1247,7 @@
         errorLine1="                handlePlayRequest();"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="455"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1532,9 +1256,7 @@
         errorLine1="                        mCurrentIndexOnQueue + &quot; queue length=&quot; +"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="458"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1543,9 +1265,7 @@
         errorLine1="                        (mPlayingQueue == null ? &quot;null&quot; : mPlayingQueue.size()));"
         errorLine2="                         ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="459"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1554,9 +1274,7 @@
         errorLine1="                        (mPlayingQueue == null ? &quot;null&quot; : mPlayingQueue.size()));"
         errorLine2="                                                          ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="459"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1565,9 +1283,7 @@
         errorLine1="                handleStopRequest(&quot;Cannot skip&quot;);"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="460"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1576,9 +1292,7 @@
         errorLine1="            mCurrentIndexOnQueue--;"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="467"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1587,9 +1301,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; mCurrentIndexOnQueue &lt; 0) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="468"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1598,9 +1310,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; mCurrentIndexOnQueue &lt; 0) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="468"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1609,9 +1319,7 @@
         errorLine1="                mCurrentIndexOnQueue = 0;"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="471"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1620,9 +1328,7 @@
         errorLine1="            if (QueueHelper.isIndexPlayable(mCurrentIndexOnQueue, mPlayingQueue)) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="473"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1631,9 +1337,7 @@
         errorLine1="            if (QueueHelper.isIndexPlayable(mCurrentIndexOnQueue, mPlayingQueue)) {"
         errorLine2="                                                                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="473"
-            column="67"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1642,9 +1346,7 @@
         errorLine1="                handlePlayRequest();"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="474"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1653,9 +1355,7 @@
         errorLine1="                        mCurrentIndexOnQueue + &quot; queue length=&quot; +"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="477"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1664,9 +1364,7 @@
         errorLine1="                        (mPlayingQueue == null ? &quot;null&quot; : mPlayingQueue.size()));"
         errorLine2="                         ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="478"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1675,9 +1373,7 @@
         errorLine1="                        (mPlayingQueue == null ? &quot;null&quot; : mPlayingQueue.size()));"
         errorLine2="                                                          ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="478"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1686,9 +1382,7 @@
         errorLine1="                handleStopRequest(&quot;Cannot skip&quot;);"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="479"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1697,9 +1391,7 @@
         errorLine1="                MediaMetadataCompat track = getCurrentPlayingMusic();"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="487"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1708,9 +1400,7 @@
         errorLine1="                    mMusicProvider.setFavorite(musicId, !mMusicProvider.isFavorite(musicId));"
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="490"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1719,9 +1409,7 @@
         errorLine1="                    mMusicProvider.setFavorite(musicId, !mMusicProvider.isFavorite(musicId));"
         errorLine2="                                                         ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="490"
-            column="58"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1730,9 +1418,7 @@
         errorLine1="                updatePlaybackState(null);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="494"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1741,9 +1427,7 @@
         errorLine1="                mPlayingQueue = QueueHelper.getRandomQueue(mMusicProvider);"
         errorLine2="                                                           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="508"
-            column="60"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1752,9 +1436,7 @@
         errorLine1="                mPlayingQueue = QueueHelper.getRandomQueue(mMusicProvider);"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="508"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1763,9 +1445,7 @@
         errorLine1="                mPlayingQueue = QueueHelper.getPlayingQueueFromSearch(query, mMusicProvider);"
         errorLine2="                                                                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="510"
-            column="78"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1774,9 +1454,7 @@
         errorLine1="                mPlayingQueue = QueueHelper.getPlayingQueueFromSearch(query, mMusicProvider);"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="510"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1785,9 +1463,7 @@
         errorLine1="            Log.d(TAG, &quot;playFromSearch  playqueue.length=&quot; + mPlayingQueue.size());"
         errorLine2="                                                             ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="513"
-            column="62"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1796,9 +1472,7 @@
         errorLine1="            mSession.setQueue(mPlayingQueue);"
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="514"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1807,9 +1481,7 @@
         errorLine1="            mSession.setQueue(mPlayingQueue);"
         errorLine2="            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="514"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1818,9 +1490,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; !mPlayingQueue.isEmpty()) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="516"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1829,9 +1499,7 @@
         errorLine1="            if (mPlayingQueue != null &amp;&amp; !mPlayingQueue.isEmpty()) {"
         errorLine2="                                          ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="516"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1840,9 +1508,7 @@
         errorLine1="                mCurrentIndexOnQueue = 0;"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="518"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1851,9 +1517,7 @@
         errorLine1="                handlePlayRequest();"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="520"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1862,9 +1526,7 @@
         errorLine1="                handleStopRequest(getString(R.string.no_search_results));"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="523"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1873,9 +1535,7 @@
         errorLine1="                    MediaSessionCompat.QueueItem queueItem = mPlayingQueue.get(mCurrentIndexOnQueue);"
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="615"
-            column="80"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1884,9 +1544,7 @@
         errorLine1="                    MediaSessionCompat.QueueItem queueItem = mPlayingQueue.get(mCurrentIndexOnQueue);"
         errorLine2="                                                             ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="615"
-            column="62"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1895,9 +1553,7 @@
         errorLine1="                    MediaMetadataCompat track = mMusicProvider.getMusic(trackId);"
         errorLine2="                                                ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="616"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1906,9 +1562,7 @@
         errorLine1="                    mMusicProvider.updateMusic(trackId, track);"
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="628"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1917,9 +1571,7 @@
         errorLine1="                        mSession.setMetadata(track);"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="634"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1928,9 +1580,7 @@
         errorLine1="            if (service != null &amp;&amp; service.mPlayback != null) {"
         errorLine2="                                           ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="774"
-            column="44"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1939,9 +1589,7 @@
         errorLine1="                if (service.mPlayback.isPlaying()) {"
         errorLine2="                            ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="775"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1950,9 +1598,7 @@
         errorLine1="                service.mServiceStarted = false;"
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="781"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -1961,9 +1607,7 @@
         errorLine1="            mPlaybackState = state;"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="244"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -1972,9 +1616,7 @@
         errorLine1="                Notification notification = createNotification();"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="250"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -1983,9 +1625,7 @@
         errorLine1="                    mNotificationManager.notify(NOTIFICATION_ID, notification);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="252"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -1994,9 +1634,7 @@
         errorLine1="            mMetadata = metadata;"
         errorLine2="            ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="260"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -2005,9 +1643,7 @@
         errorLine1="            Notification notification = createNotification();"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="262"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -2016,9 +1652,7 @@
         errorLine1="                mNotificationManager.notify(NOTIFICATION_ID, notification);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="264"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -2027,9 +1661,7 @@
         errorLine1="            updateSessionToken();"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="272"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -2038,9 +1670,7 @@
         errorLine1="                if (mMetadata != null &amp;&amp; mMetadata.getDescription() != null &amp;&amp;"
         errorLine2="                    ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="387"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -2049,9 +1679,7 @@
         errorLine1="                if (mMetadata != null &amp;&amp; mMetadata.getDescription() != null &amp;&amp;"
         errorLine2="                                         ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="387"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -2060,9 +1688,7 @@
         errorLine1="                    artUrl.equals(mMetadata.getDescription().getIconUri().toString())) {"
         errorLine2="                                  ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="388"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -2071,9 +1697,7 @@
         errorLine1="                    mNotificationManager.notify(NOTIFICATION_ID, builder.build());"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="392"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -2082,9 +1706,7 @@
         errorLine1="                retrieveMedia();"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="189"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -2093,9 +1715,7 @@
         errorLine1="                return mCurrentState;"
         errorLine2="                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="190"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -2104,9 +1724,7 @@
         errorLine1="                    mService.startService(i);"
         errorLine2="                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/Playback.java"
-            line="91"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/Playback.java"/>
     </issue>
 
     <issue
@@ -2115,9 +1733,7 @@
         errorLine1="            holder = new ViewHolder();"
         errorLine2="                     ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueAdapter.java"
-            line="63"
-            column="22"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueAdapter.java"/>
     </issue>
 
     <issue
@@ -2126,9 +1742,7 @@
         errorLine1="            Log.d(TAG, &quot;onConnected: session token &quot; + mMediaBrowser.getSessionToken());"
         errorLine2="                                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="63"
-            column="56"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2137,9 +1751,7 @@
         errorLine1="            if (mMediaBrowser.getSessionToken() == null) {"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="65"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2148,9 +1760,7 @@
         errorLine1="            mMediaController = new MediaControllerCompat(getActivity(),"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="69"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2159,9 +1769,7 @@
         errorLine1="                    mMediaBrowser.getSessionToken());"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="70"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2170,9 +1778,7 @@
         errorLine1="            mTransportControls = mMediaController.getTransportControls();"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="71"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2181,9 +1787,7 @@
         errorLine1="            mTransportControls = mMediaController.getTransportControls();"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="71"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2192,9 +1796,7 @@
         errorLine1="            mMediaController.registerCallback(mSessionCallback);"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="72"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2203,9 +1805,7 @@
         errorLine1="            mMediaController.registerCallback(mSessionCallback);"
         errorLine2="                                              ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="72"
-            column="47"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2214,9 +1814,7 @@
         errorLine1="            ((MediaBrowserSupport) getActivity()).setMediaController(mMediaController);"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="74"
-            column="70"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2225,9 +1823,7 @@
         errorLine1="            mPlaybackState = mMediaController.getPlaybackState();"
         errorLine2="                             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="75"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2236,9 +1832,7 @@
         errorLine1="            mPlaybackState = mMediaController.getPlaybackState();"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="75"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2247,9 +1841,7 @@
         errorLine1="            List&lt;MediaSessionCompat.QueueItem> queue = mMediaController.getQueue();"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="77"
-            column="56"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2258,9 +1850,7 @@
         errorLine1="                mQueueAdapter.clear();"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="79"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2269,9 +1859,7 @@
         errorLine1="                mQueueAdapter.notifyDataSetInvalidated();"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="80"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2280,9 +1868,7 @@
         errorLine1="                mQueueAdapter.addAll(queue);"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="81"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2291,9 +1877,7 @@
         errorLine1="                mQueueAdapter.notifyDataSetChanged();"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="82"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2302,9 +1886,7 @@
         errorLine1="            onPlaybackStateChanged(mPlaybackState);"
         errorLine2="                                   ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="84"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2313,9 +1895,7 @@
         errorLine1="            onPlaybackStateChanged(mPlaybackState);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="84"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2324,9 +1904,7 @@
         errorLine1="            mMediaController.unregisterCallback(mSessionCallback);"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="95"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2335,9 +1913,7 @@
         errorLine1="            mMediaController.unregisterCallback(mSessionCallback);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="95"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2346,9 +1922,7 @@
         errorLine1="            mTransportControls = null;"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="96"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2357,9 +1931,7 @@
         errorLine1="            mMediaController = null;"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="97"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2368,9 +1940,7 @@
         errorLine1="            mPlaybackState = state;"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="117"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2379,9 +1949,7 @@
         errorLine1="            QueueFragment.this.onPlaybackStateChanged(state);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="118"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2390,9 +1958,7 @@
         errorLine1="                mQueueAdapter.clear();"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="125"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2401,9 +1967,7 @@
         errorLine1="                mQueueAdapter.notifyDataSetInvalidated();"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="126"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2412,9 +1976,7 @@
         errorLine1="                mQueueAdapter.addAll(queue);"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="127"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2423,9 +1985,7 @@
         errorLine1="                mQueueAdapter.notifyDataSetChanged();"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="128"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2434,9 +1994,7 @@
         errorLine1="                MediaSessionCompat.QueueItem item = mQueueAdapter.getItem(position);"
         errorLine2="                                                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="162"
-            column="53"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2445,9 +2003,7 @@
         errorLine1="                mTransportControls.skipToQueueItem(item.getQueueId());"
         errorLine2="                ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="163"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2456,9 +2012,7 @@
         errorLine1="            final int state = mPlaybackState == null ?"
         errorLine2="                              ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="256"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2467,9 +2021,7 @@
         errorLine1="                    PlaybackStateCompat.STATE_NONE : mPlaybackState.getState();"
         errorLine2="                                                     ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="257"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2478,9 +2030,7 @@
         errorLine1="                        playMedia();"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="264"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2489,9 +2039,7 @@
         errorLine1="                        pauseMedia();"
         errorLine2="                        ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="266"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2500,9 +2048,7 @@
         errorLine1="                    skipToPrevious();"
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="271"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2511,9 +2057,7 @@
         errorLine1="                    skipToNext();"
         errorLine2="                    ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="274"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -2522,9 +2066,7 @@
         errorLine1="                mRoundedBitmapDrawable.setCircular(isChecked);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/graphics/RoundedBitmapDrawableActivity.java"
-            line="58"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/graphics/RoundedBitmapDrawableActivity.java"/>
     </issue>
 
     <issue
@@ -2533,9 +2075,7 @@
         errorLine1="        mAdapter = new ColorPagerAdapter();"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/ViewPagerActivity.java"
-            line="43"
-            column="20"/>
+            file="src/main/java/com/example/android/supportv4/view/ViewPagerActivity.java"/>
     </issue>
 
     <issue
@@ -2544,9 +2084,7 @@
         errorLine1="                    if (mRootWindowInsetsEnabled) {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"
-            line="90"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"/>
     </issue>
 
     <issue
@@ -2555,9 +2093,7 @@
         errorLine1="                        updateTextForInsets(ViewCompat.getRootWindowInsets(root));"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"
-            line="91"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/view/WindowInsetsPlayground.java"/>
     </issue>
 
     <issue
@@ -2566,9 +2102,7 @@
         errorLine1="             String mediaId) {"
         errorLine2="             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="81"
-            column="14"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -2577,9 +2111,7 @@
         errorLine1="             long queueId) {"
         errorLine2="             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="93"
-            column="14"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -2588,9 +2120,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java"
-            line="47"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java"/>
     </issue>
 
     <issue
@@ -2599,9 +2129,7 @@
         errorLine1="        public AccessibilityDelegateSupportView(Context context, AttributeSet attrs) {"
         errorLine2="                                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java"
-            line="62"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java"/>
     </issue>
 
     <issue
@@ -2610,9 +2138,7 @@
         errorLine1="        public AccessibilityDelegateSupportView(Context context, AttributeSet attrs) {"
         errorLine2="                                                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java"
-            line="62"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java"/>
     </issue>
 
     <issue
@@ -2621,9 +2147,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java"
-            line="59"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java"/>
     </issue>
 
     <issue
@@ -2632,9 +2156,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityRoleDescriptionSupportActivity.java"
-            line="43"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/accessibility/AccessibilityRoleDescriptionSupportActivity.java"/>
     </issue>
 
     <issue
@@ -2643,9 +2165,7 @@
         errorLine1="    public static AlbumArtCache getInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="53"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2654,9 +2174,7 @@
         errorLine1="    public Bitmap getBigImage(String artUrl) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="71"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2665,9 +2183,7 @@
         errorLine1="    public Bitmap getBigImage(String artUrl) {"
         errorLine2="                              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="71"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2676,9 +2192,7 @@
         errorLine1="    public Bitmap getIconImage(String artUrl) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="76"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2687,9 +2201,7 @@
         errorLine1="    public Bitmap getIconImage(String artUrl) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="76"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2698,9 +2210,7 @@
         errorLine1="    public void fetch(final String artUrl, final FetchListener listener) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="82"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2709,9 +2219,7 @@
         errorLine1="    public void fetch(final String artUrl, final FetchListener listener) {"
         errorLine2="                                                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="82"
-            column="50"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2720,9 +2228,7 @@
         errorLine1="        public abstract void onFetched(String artUrl, Bitmap bigImage, Bitmap iconImage);"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="126"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2731,9 +2237,7 @@
         errorLine1="        public abstract void onFetched(String artUrl, Bitmap bigImage, Bitmap iconImage);"
         errorLine2="                                                      ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="126"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2742,9 +2246,7 @@
         errorLine1="        public abstract void onFetched(String artUrl, Bitmap bigImage, Bitmap iconImage);"
         errorLine2="                                                                       ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="126"
-            column="72"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2753,9 +2255,7 @@
         errorLine1="        public void onError(String artUrl, Exception e) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="127"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2764,9 +2264,7 @@
         errorLine1="        public void onError(String artUrl, Exception e) {"
         errorLine2="                                           ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"
-            line="127"
-            column="44"/>
+            file="src/main/java/com/example/android/supportv4/media/AlbumArtCache.java"/>
     </issue>
 
     <issue
@@ -2775,9 +2273,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/text/BidiFormatterSupport.java"
-            line="36"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/text/BidiFormatterSupport.java"/>
     </issue>
 
     <issue
@@ -2786,9 +2282,7 @@
         errorLine1="    public static Bitmap scaleBitmap(Bitmap src, int maxWidth, int maxHeight) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"
-            line="35"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"/>
     </issue>
 
     <issue
@@ -2797,9 +2291,7 @@
         errorLine1="    public static Bitmap scaleBitmap(Bitmap src, int maxWidth, int maxHeight) {"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"
-            line="35"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"/>
     </issue>
 
     <issue
@@ -2808,9 +2300,7 @@
         errorLine1="    public static Bitmap scaleBitmap(int scaleFactor, InputStream is) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"
-            line="42"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"/>
     </issue>
 
     <issue
@@ -2819,9 +2309,7 @@
         errorLine1="    public static Bitmap scaleBitmap(int scaleFactor, InputStream is) {"
         errorLine2="                                                      ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"
-            line="42"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"/>
     </issue>
 
     <issue
@@ -2830,9 +2318,7 @@
         errorLine1="    public static int findScaleFactor(int targetW, int targetH, InputStream is) {"
         errorLine2="                                                                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"
-            line="53"
-            column="65"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"/>
     </issue>
 
     <issue
@@ -2841,9 +2327,7 @@
         errorLine1="    public static Bitmap fetchAndRescaleBitmap(String uri, int width, int height)"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"
-            line="66"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"/>
     </issue>
 
     <issue
@@ -2852,9 +2336,7 @@
         errorLine1="    public static Bitmap fetchAndRescaleBitmap(String uri, int width, int height)"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"
-            line="66"
-            column="48"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/BitmapHelper.java"/>
     </issue>
 
     <issue
@@ -2863,9 +2345,7 @@
         errorLine1="        void onMediaItemSelected(MediaBrowserCompat.MediaItem item);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="64"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -2874,9 +2354,7 @@
         errorLine1="    public static BrowseFragment newInstance(String mediaId) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="169"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -2885,9 +2363,7 @@
         errorLine1="    public static BrowseFragment newInstance(String mediaId) {"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="169"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -2896,9 +2372,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="178"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -2907,9 +2381,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="178"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -2918,9 +2390,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="178"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -2929,9 +2399,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"
-            line="179"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/BrowseFragment.java"/>
     </issue>
 
     <issue
@@ -2940,9 +2408,7 @@
         errorLine1="    public static boolean isValidCarPackage(String packageName) {"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/CarHelper.java"
-            line="34"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/CarHelper.java"/>
     </issue>
 
     <issue
@@ -2951,9 +2417,7 @@
         errorLine1="    public static void setSlotReservationFlags(Bundle extras, boolean reservePlayingQueueSlot,"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/CarHelper.java"
-            line="38"
-            column="48"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/CarHelper.java"/>
     </issue>
 
     <issue
@@ -2962,9 +2426,7 @@
         errorLine1="    public CheckableFrameLayout(Context context) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java"
-            line="30"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java"/>
     </issue>
 
     <issue
@@ -2973,9 +2435,7 @@
         errorLine1="    public CheckableFrameLayout(Context context, AttributeSet attrs) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java"
-            line="34"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java"/>
     </issue>
 
     <issue
@@ -2984,9 +2444,7 @@
         errorLine1="    public CheckableFrameLayout(Context context, AttributeSet attrs) {"
         errorLine2="                                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java"
-            line="34"
-            column="50"/>
+            file="src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java"/>
     </issue>
 
     <issue
@@ -2995,9 +2453,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java"
-            line="62"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java"/>
     </issue>
 
     <issue
@@ -3006,9 +2462,7 @@
         errorLine1="    public void onSaveInstanceState(Bundle savedInstanceState) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java"
-            line="179"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java"/>
     </issue>
 
     <issue
@@ -3017,9 +2471,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ContentLoadingProgressBarActivity.java"
-            line="54"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/widget/ContentLoadingProgressBarActivity.java"/>
     </issue>
 
     <issue
@@ -3028,9 +2480,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java"
-            line="42"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java"/>
     </issue>
 
     <issue
@@ -3039,9 +2489,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="70"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3050,9 +2498,7 @@
         errorLine1="        public CustomView(Context context, AttributeSet attrs) {"
         errorLine2="                          ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="109"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3061,9 +2507,7 @@
         errorLine1="        public CustomView(Context context, AttributeSet attrs) {"
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="109"
-            column="44"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3072,9 +2516,7 @@
         errorLine1="        public CustomItem addItem(String description, float left, float top, float right,"
         errorLine2="               ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="157"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3083,9 +2525,7 @@
         errorLine1="        public CustomItem addItem(String description, float left, float top, float right,"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="157"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3094,9 +2534,7 @@
         errorLine1="        public void setParentItem(CustomItem item, CustomItem parent) {"
         errorLine2="                                  ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="174"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3105,9 +2543,7 @@
         errorLine1="        public void setParentItem(CustomItem item, CustomItem parent) {"
         errorLine2="                                                   ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="174"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3116,9 +2552,7 @@
         errorLine1="        protected CustomItem getItem(int index) {"
         errorLine2="                  ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="264"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3127,9 +2561,7 @@
         errorLine1="        protected static void scaleRectF(RectF in, Rect out, int width, int height) {"
         errorLine2="                                         ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="272"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3138,9 +2570,7 @@
         errorLine1="        protected static void scaleRectF(RectF in, Rect out, int width, int height) {"
         errorLine2="                                                   ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"
-            line="272"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3149,9 +2579,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/FileProviderExample.java"
-            line="43"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/content/FileProviderExample.java"/>
     </issue>
 
     <issue
@@ -3160,9 +2588,7 @@
         errorLine1="    public void onShareFileClick(View view) {"
         errorLine2="                                 ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/FileProviderExample.java"
-            line="48"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/content/FileProviderExample.java"/>
     </issue>
 
     <issue
@@ -3171,9 +2597,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java"
-            line="40"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3182,9 +2606,7 @@
         errorLine1="        public static MyAlertDialogFragment newInstance(int title) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java"
-            line="78"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3193,9 +2615,7 @@
         errorLine1="        public Dialog onCreateDialog(Bundle savedInstanceState) {"
         errorLine2="               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java"
-            line="87"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3204,9 +2624,7 @@
         errorLine1="        public Dialog onCreateDialog(Bundle savedInstanceState) {"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java"
-            line="87"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3215,9 +2633,7 @@
         errorLine1="    @Override protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"
-            line="44"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"/>
     </issue>
 
     <issue
@@ -3226,9 +2642,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"
-            line="94"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"/>
     </issue>
 
     <issue
@@ -3237,9 +2651,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"
-            line="110"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"/>
     </issue>
 
     <issue
@@ -3248,9 +2660,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"
-            line="110"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"/>
     </issue>
 
     <issue
@@ -3259,9 +2669,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"
-            line="110"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"/>
     </issue>
 
     <issue
@@ -3270,9 +2678,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"
-            line="111"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java"/>
     </issue>
 
     <issue
@@ -3281,9 +2687,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"
-            line="40"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3292,9 +2696,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"
-            line="52"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3303,9 +2705,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"
-            line="52"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3314,9 +2714,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"
-            line="52"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3325,9 +2723,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"
-            line="53"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3336,9 +2732,7 @@
         errorLine1="        public boolean onContextItemSelected(MenuItem item) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"
-            line="67"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3347,9 +2741,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"
-            line="39"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"/>
     </issue>
 
     <issue
@@ -3358,9 +2750,7 @@
         errorLine1="    public void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"
-            line="63"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"/>
     </issue>
 
     <issue
@@ -3369,9 +2759,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"
-            line="111"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"/>
     </issue>
 
     <issue
@@ -3380,9 +2768,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"
-            line="121"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"/>
     </issue>
 
     <issue
@@ -3391,9 +2777,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"
-            line="121"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"/>
     </issue>
 
     <issue
@@ -3402,9 +2786,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"
-            line="121"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"/>
     </issue>
 
     <issue
@@ -3413,9 +2795,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"
-            line="122"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java"/>
     </issue>
 
     <issue
@@ -3424,9 +2804,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"
-            line="35"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"/>
     </issue>
 
     <issue
@@ -3435,9 +2813,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"
-            line="74"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"/>
     </issue>
 
     <issue
@@ -3446,9 +2822,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"
-            line="74"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"/>
     </issue>
 
     <issue
@@ -3457,9 +2831,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"
-            line="74"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"/>
     </issue>
 
     <issue
@@ -3468,9 +2840,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"
-            line="75"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java"/>
     </issue>
 
     <issue
@@ -3479,9 +2849,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"
-            line="38"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3490,9 +2858,7 @@
         errorLine1="    public void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"
-            line="63"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3501,9 +2867,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"
-            line="123"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3512,9 +2876,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"
-            line="149"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3523,9 +2885,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"
-            line="149"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3534,9 +2894,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"
-            line="149"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3545,9 +2903,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"
-            line="150"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java"/>
     </issue>
 
     <issue
@@ -3556,9 +2912,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="40"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3567,9 +2921,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="81"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3578,9 +2930,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="81"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3589,9 +2939,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="81"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3600,9 +2948,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="82"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3611,9 +2957,7 @@
         errorLine1="        public void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="96"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3622,9 +2966,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="107"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3633,9 +2975,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="107"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3644,9 +2984,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="107"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3655,9 +2993,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"
-            line="108"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java"/>
     </issue>
 
     <issue
@@ -3666,9 +3002,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="50"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3677,9 +3011,7 @@
         errorLine1="        protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="65"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3688,9 +3020,7 @@
         errorLine1="        public void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="125"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3699,9 +3029,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="131"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3710,9 +3038,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="131"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3721,9 +3047,7 @@
         errorLine1="        public static DetailsFragment newInstance(int index) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="185"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3732,9 +3056,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="201"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3743,9 +3065,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="201"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3754,9 +3074,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="201"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3765,9 +3083,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"
-            line="202"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java"/>
     </issue>
 
     <issue
@@ -3776,9 +3092,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java"
-            line="39"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java"/>
     </issue>
 
     <issue
@@ -3787,9 +3101,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java"
-            line="59"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java"/>
     </issue>
 
     <issue
@@ -3798,9 +3110,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java"
-            line="59"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java"/>
     </issue>
 
     <issue
@@ -3809,9 +3119,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"
-            line="50"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -3820,9 +3128,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"
-            line="50"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -3831,9 +3137,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"
-            line="50"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -3842,9 +3146,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"
-            line="51"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -3853,9 +3155,7 @@
         errorLine1="    public void onViewStateRestored(Bundle savedInstanceState) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"
-            line="82"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -3864,9 +3164,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"
-            line="52"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3875,9 +3173,7 @@
         errorLine1="    protected void onRestoreInstanceState(Bundle savedInstanceState) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"
-            line="82"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3886,9 +3182,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"
-            line="106"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3897,9 +3191,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"
-            line="112"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3908,9 +3200,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"
-            line="112"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3919,9 +3209,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"
-            line="127"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3930,9 +3218,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"
-            line="133"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3941,9 +3227,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"
-            line="133"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java"/>
     </issue>
 
     <issue
@@ -3952,9 +3236,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="51"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -3963,9 +3245,7 @@
         errorLine1="        public MyAdapter(FragmentManager fm) {"
         errorLine2="                         ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="78"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -3974,9 +3254,7 @@
         errorLine1="        public Fragment getItem(int position) {"
         errorLine2="               ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="88"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -3985,9 +3263,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="115"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -3996,9 +3272,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="125"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -4007,9 +3281,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="125"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -4018,9 +3290,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="125"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -4029,9 +3299,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="126"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -4040,9 +3308,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="141"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -4051,9 +3317,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"
-            line="141"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java"/>
     </issue>
 
     <issue
@@ -4062,9 +3326,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="41"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -4073,9 +3335,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="96"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -4084,9 +3344,7 @@
         errorLine1="        public void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="101"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -4095,9 +3353,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="106"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -4106,9 +3362,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="106"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -4117,9 +3371,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="106"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -4128,9 +3380,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="107"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -4139,9 +3389,7 @@
         errorLine1="        public void onActivityResult(int requestCode, int resultCode, Intent data) {"
         errorLine2="                                                                      ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"
-            line="130"
-            column="71"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java"/>
     </issue>
 
     <issue
@@ -4150,9 +3398,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"
-            line="36"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -4161,9 +3407,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"
-            line="50"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -4172,9 +3416,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"
-            line="50"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -4183,9 +3425,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"
-            line="50"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -4194,9 +3434,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"
-            line="51"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -4205,9 +3443,7 @@
         errorLine1="    public void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"
-            line="86"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java"/>
     </issue>
 
     <issue
@@ -4216,9 +3452,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"
-            line="40"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"/>
     </issue>
 
     <issue
@@ -4227,9 +3461,7 @@
         errorLine1="    public void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"
-            line="76"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"/>
     </issue>
 
     <issue
@@ -4238,9 +3470,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"
-            line="121"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"/>
     </issue>
 
     <issue
@@ -4249,9 +3479,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"
-            line="131"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"/>
     </issue>
 
     <issue
@@ -4260,9 +3488,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"
-            line="131"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"/>
     </issue>
 
     <issue
@@ -4271,9 +3497,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"
-            line="131"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"/>
     </issue>
 
     <issue
@@ -4282,9 +3506,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"
-            line="132"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java"/>
     </issue>
 
     <issue
@@ -4293,9 +3515,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="51"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4304,9 +3524,7 @@
         errorLine1="        public MyAdapter(FragmentManager fm) {"
         errorLine2="                         ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="78"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4315,9 +3533,7 @@
         errorLine1="        public Fragment getItem(int position) {"
         errorLine2="               ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="88"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4326,9 +3542,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="115"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4337,9 +3551,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="125"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4348,9 +3560,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="125"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4359,9 +3569,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="125"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4370,9 +3578,7 @@
         errorLine1="                Bundle savedInstanceState) {"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="126"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4381,9 +3587,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="141"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4392,9 +3596,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"
-            line="141"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java"/>
     </issue>
 
     <issue
@@ -4403,9 +3605,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="46"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4414,9 +3614,7 @@
         errorLine1="    protected void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="72"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4425,9 +3623,7 @@
         errorLine1="        public TabsAdapter(FragmentActivity activity, TabHost tabHost, ViewPager pager) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="122"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4436,9 +3632,7 @@
         errorLine1="        public TabsAdapter(FragmentActivity activity, TabHost tabHost, ViewPager pager) {"
         errorLine2="                                                      ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="122"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4447,9 +3641,7 @@
         errorLine1="        public TabsAdapter(FragmentActivity activity, TabHost tabHost, ViewPager pager) {"
         errorLine2="                                                                       ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="122"
-            column="72"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4458,9 +3650,7 @@
         errorLine1="        public void addTab(TabHost.TabSpec tabSpec, Class&lt;?> clss, Bundle args) {"
         errorLine2="                           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="133"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4469,9 +3659,7 @@
         errorLine1="        public void addTab(TabHost.TabSpec tabSpec, Class&lt;?> clss, Bundle args) {"
         errorLine2="                                                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="133"
-            column="53"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4480,9 +3668,7 @@
         errorLine1="        public void addTab(TabHost.TabSpec tabSpec, Class&lt;?> clss, Bundle args) {"
         errorLine2="                                                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="133"
-            column="68"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4491,9 +3677,7 @@
         errorLine1="        public Fragment getItem(int position) {"
         errorLine2="               ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"
-            line="147"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java"/>
     </issue>
 
     <issue
@@ -4502,9 +3686,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="69"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4513,9 +3695,7 @@
         errorLine1="        public AppEntry(AppListLoader loader, ApplicationInfo info) {"
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="86"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4524,9 +3704,7 @@
         errorLine1="        public AppEntry(AppListLoader loader, ApplicationInfo info) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="86"
-            column="47"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4535,9 +3713,7 @@
         errorLine1="        public ApplicationInfo getApplicationInfo() {"
         errorLine2="               ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="92"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4546,9 +3722,7 @@
         errorLine1="        public String getLabel() {"
         errorLine2="               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="96"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4557,9 +3731,7 @@
         errorLine1="        public Drawable getIcon() {"
         errorLine2="               ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="100"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4568,9 +3740,7 @@
         errorLine1="        public PackageIntentReceiver(AppListLoader loader) {"
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="187"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4579,9 +3749,7 @@
         errorLine1="        public AppListLoader(Context context) {"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="217"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4590,9 +3758,7 @@
         errorLine1="        @Override public List&lt;AppEntry> loadInBackground() {"
         errorLine2="                         ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="231"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4601,9 +3767,7 @@
         errorLine1="        @Override public void deliverResult(List&lt;AppEntry> data) {"
         errorLine2="                                            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="263"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4612,9 +3776,7 @@
         errorLine1="        @Override public void onCanceled(List&lt;AppEntry> data) {"
         errorLine2="                                         ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="325"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4623,9 +3785,7 @@
         errorLine1="        protected void onReleaseResources(List&lt;AppEntry> apps) {"
         errorLine2="                                          ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="360"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4634,9 +3794,7 @@
         errorLine1="        public AppListAdapter(Context context) {"
         errorLine2="                              ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="371"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4645,9 +3803,7 @@
         errorLine1="        public void setData(List&lt;AppEntry> data) {"
         errorLine2="                            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="376"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4656,9 +3812,7 @@
         errorLine1="        @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="437"
-            column="51"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4667,9 +3821,7 @@
         errorLine1="        @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="437"
-            column="62"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4678,9 +3830,7 @@
         errorLine1="        @Override public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="473"
-            column="47"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4689,9 +3839,7 @@
         errorLine1="        @Override public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                                          ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="473"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4700,9 +3848,7 @@
         errorLine1="        @Override public Loader&lt;List&lt;AppEntry>> onCreateLoader(int id, Bundle args) {"
         errorLine2="                                                                       ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="479"
-            column="72"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4711,9 +3857,7 @@
         errorLine1="                List&lt;AppEntry> data) {"
         errorLine2="                ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"
-            line="486"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java"/>
     </issue>
 
     <issue
@@ -4722,9 +3866,7 @@
         errorLine1="        public Cursor query(Uri uri, String[] projection, String selection,"
         errorLine2="               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="214"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4733,9 +3875,7 @@
         errorLine1="        public Cursor query(Uri uri, String[] projection, String selection,"
         errorLine2="                            ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="214"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4744,9 +3884,7 @@
         errorLine1="        public Cursor query(Uri uri, String[] projection, String selection,"
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="214"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4755,9 +3893,7 @@
         errorLine1="        public Cursor query(Uri uri, String[] projection, String selection,"
         errorLine2="                                                          ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="214"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4766,9 +3902,7 @@
         errorLine1="                String[] selectionArgs, String sortOrder) {"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="215"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4777,9 +3911,7 @@
         errorLine1="                String[] selectionArgs, String sortOrder) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="215"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4788,9 +3920,7 @@
         errorLine1="        public String getType(Uri uri) {"
         errorLine2="               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="257"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4799,9 +3929,7 @@
         errorLine1="        public String getType(Uri uri) {"
         errorLine2="                              ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="257"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4810,9 +3938,7 @@
         errorLine1="        public Uri insert(Uri uri, ContentValues initialValues) {"
         errorLine2="               ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="272"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4821,9 +3947,7 @@
         errorLine1="        public Uri insert(Uri uri, ContentValues initialValues) {"
         errorLine2="                          ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="272"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4832,9 +3956,7 @@
         errorLine1="        public Uri insert(Uri uri, ContentValues initialValues) {"
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="272"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4843,9 +3965,7 @@
         errorLine1="        public int delete(Uri uri, String where, String[] whereArgs) {"
         errorLine2="                          ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="308"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4854,9 +3974,7 @@
         errorLine1="        public int delete(Uri uri, String where, String[] whereArgs) {"
         errorLine2="                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="308"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4865,9 +3983,7 @@
         errorLine1="        public int delete(Uri uri, String where, String[] whereArgs) {"
         errorLine2="                                                 ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="308"
-            column="50"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4876,9 +3992,7 @@
         errorLine1="        public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {"
         errorLine2="                          ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="344"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4887,9 +4001,7 @@
         errorLine1="        public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {"
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="344"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4898,9 +4010,7 @@
         errorLine1="        public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {"
         errorLine2="                                                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="344"
-            column="58"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4909,9 +4019,7 @@
         errorLine1="        public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {"
         errorLine2="                                                                       ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="344"
-            column="72"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4920,9 +4028,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="374"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4931,9 +4037,7 @@
         errorLine1="        @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="424"
-            column="51"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4942,9 +4046,7 @@
         errorLine1="        @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="424"
-            column="62"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4953,9 +4055,7 @@
         errorLine1="        @Override public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                                       ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="432"
-            column="56"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4964,9 +4064,7 @@
         errorLine1="        @Override public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="482"
-            column="47"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4975,9 +4073,7 @@
         errorLine1="        @Override public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                                          ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="482"
-            column="59"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4986,9 +4082,7 @@
         errorLine1="        public Loader&lt;Cursor> onCreateLoader(int id, Bundle args) {"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="495"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -4997,9 +4091,7 @@
         errorLine1="        public void onLoadFinished(@NonNull Loader&lt;Cursor> loader, Cursor data) {"
         errorLine2="                                                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"
-            line="503"
-            column="68"/>
+            file="src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java"/>
     </issue>
 
     <issue
@@ -5008,9 +4100,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java"
-            line="52"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java"/>
     </issue>
 
     <issue
@@ -5019,9 +4109,7 @@
         errorLine1="        public IBinder onBind(Intent intent) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java"
-            line="167"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java"/>
     </issue>
 
     <issue
@@ -5030,9 +4118,7 @@
         errorLine1="    public BrowserRoot onGetRoot(String clientPackageName, int clientUid, Bundle rootHints) {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="228"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5041,9 +4127,7 @@
         errorLine1="    public BrowserRoot onGetRoot(String clientPackageName, int clientUid, Bundle rootHints) {"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="228"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5052,9 +4136,7 @@
         errorLine1="    public BrowserRoot onGetRoot(String clientPackageName, int clientUid, Bundle rootHints) {"
         errorLine2="                                                                          ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="228"
-            column="75"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5063,9 +4145,7 @@
         errorLine1="    public void onLoadChildren(final String parentMediaId, final Result&lt;List&lt;MediaItem>> result) {"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="249"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5074,9 +4154,7 @@
         errorLine1="    public void onLoadChildren(final String parentMediaId, final Result&lt;List&lt;MediaItem>> result) {"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="249"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5085,9 +4163,7 @@
         errorLine1="    public void onLoadChildren(final String parentMediaId, final Result&lt;List&lt;MediaItem>> result,"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="254"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5096,9 +4172,7 @@
         errorLine1="    public void onLoadChildren(final String parentMediaId, final Result&lt;List&lt;MediaItem>> result,"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="254"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5107,9 +4181,7 @@
         errorLine1="            final Bundle options) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="255"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5118,9 +4190,7 @@
         errorLine1="    public void onError(String error) {"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"
-            line="757"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java"/>
     </issue>
 
     <issue
@@ -5129,9 +4199,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java"
-            line="34"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java"/>
     </issue>
 
     <issue
@@ -5140,9 +4208,7 @@
         errorLine1="    public void onMediaItemSelected(MediaBrowserCompat.MediaItem item) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java"
-            line="45"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java"/>
     </issue>
 
     <issue
@@ -5151,9 +4217,7 @@
         errorLine1="    public void setMediaController(MediaControllerCompat mediaController) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java"
-            line="64"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java"/>
     </issue>
 
     <issue
@@ -5162,9 +4226,7 @@
         errorLine1="    public static String createMediaID(String musicID, String... categories) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="36"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5173,9 +4235,7 @@
         errorLine1="    public static String createMediaID(String musicID, String... categories) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="36"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5184,9 +4244,7 @@
         errorLine1="    public static String createMediaID(String musicID, String... categories) {"
         errorLine2="                                                       ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="36"
-            column="56"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5195,9 +4253,7 @@
         errorLine1="    public static String createBrowseCategoryMediaID(String categoryType, String categoryValue) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="55"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5206,9 +4262,7 @@
         errorLine1="    public static String createBrowseCategoryMediaID(String categoryType, String categoryValue) {"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="55"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5217,9 +4271,7 @@
         errorLine1="    public static String createBrowseCategoryMediaID(String categoryType, String categoryValue) {"
         errorLine2="                                                                          ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="55"
-            column="75"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5228,9 +4280,7 @@
         errorLine1="    public static String extractMusicIDFromMediaID(String mediaID) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="68"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5239,9 +4289,7 @@
         errorLine1="    public static String extractMusicIDFromMediaID(String mediaID) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="68"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5250,9 +4298,7 @@
         errorLine1="    public static String[] getHierarchy(String mediaID) {"
         errorLine2="                  ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="84"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5261,9 +4307,7 @@
         errorLine1="    public static String[] getHierarchy(String mediaID) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="84"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5272,9 +4316,7 @@
         errorLine1="    public static String extractBrowseCategoryValueFromMediaID(String mediaID) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="92"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5283,9 +4325,7 @@
         errorLine1="    public static String extractBrowseCategoryValueFromMediaID(String mediaID) {"
         errorLine2="                                                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="92"
-            column="64"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5294,9 +4334,7 @@
         errorLine1="    public static String getParentMediaID(String mediaID) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="104"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5305,9 +4343,7 @@
         errorLine1="    public static String getParentMediaID(String mediaID) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"
-            line="104"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/MediaIDHelper.java"/>
     </issue>
 
     <issue
@@ -5316,9 +4352,7 @@
         errorLine1="    public MediaNotificationManager(MediaBrowserServiceSupport service) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"
-            line="80"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java"/>
     </issue>
 
     <issue
@@ -5327,9 +4361,7 @@
         errorLine1="    public List&lt;String> getGenres() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="93"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5338,9 +4370,7 @@
         errorLine1="    public List&lt;MediaMetadataCompat> getMusicsByGenre(String genre) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="103"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5349,9 +4379,7 @@
         errorLine1="    public List&lt;MediaMetadataCompat> getMusicsByGenre(String genre) {"
         errorLine2="                                                      ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="103"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5360,9 +4388,7 @@
         errorLine1="    public Iterable&lt;MediaMetadataCompat> searchMusic(String titleQuery) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="115"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5371,9 +4397,7 @@
         errorLine1="    public Iterable&lt;MediaMetadataCompat> searchMusic(String titleQuery) {"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="115"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5382,9 +4406,7 @@
         errorLine1="    public MediaMetadataCompat getMusic(String musicId) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="135"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5393,9 +4415,7 @@
         errorLine1="    public MediaMetadataCompat getMusic(String musicId) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="135"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5404,9 +4424,7 @@
         errorLine1="    public synchronized void updateMusic(String musicId, MediaMetadataCompat metadata) {"
         errorLine2="                                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="139"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5415,9 +4433,7 @@
         errorLine1="    public synchronized void updateMusic(String musicId, MediaMetadataCompat metadata) {"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="139"
-            column="58"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5426,9 +4442,7 @@
         errorLine1="    public void setFavorite(String musicId, boolean favorite) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="156"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5437,9 +4451,7 @@
         errorLine1="    public boolean isFavorite(String musicId) {"
         errorLine2="                              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="164"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5448,9 +4460,7 @@
         errorLine1="    public void retrieveMediaAsync(final Callback callback) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"
-            line="177"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MusicProvider.java"/>
     </issue>
 
     <issue
@@ -5459,9 +4469,7 @@
         errorLine1="    public MediaMetadataCompat metadata;"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MutableMediaMetadata.java"
-            line="28"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MutableMediaMetadata.java"/>
     </issue>
 
     <issue
@@ -5470,9 +4478,7 @@
         errorLine1="    public MutableMediaMetadata(String trackId, MediaMetadataCompat metadata) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MutableMediaMetadata.java"
-            line="31"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MutableMediaMetadata.java"/>
     </issue>
 
     <issue
@@ -5481,9 +4487,7 @@
         errorLine1="    public MutableMediaMetadata(String trackId, MediaMetadataCompat metadata) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/model/MutableMediaMetadata.java"
-            line="31"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/media/model/MutableMediaMetadata.java"/>
     </issue>
 
     <issue
@@ -5492,9 +4496,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/NestedScrollActivity.java"
-            line="31"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/widget/NestedScrollActivity.java"/>
     </issue>
 
     <issue
@@ -5503,9 +4505,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/NestedScrollActivity3Levels.java"
-            line="31"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/widget/NestedScrollActivity3Levels.java"/>
     </issue>
 
     <issue
@@ -5514,9 +4514,7 @@
         errorLine1="    public PackageValidator(Context ctx) {"
         errorLine2="                            ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/PackageValidator.java"
-            line="52"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/media/PackageValidator.java"/>
     </issue>
 
     <issue
@@ -5525,9 +4523,7 @@
         errorLine1="    public boolean isCallerAllowed(Context context, String callingPackage, int callingUid) {"
         errorLine2="                                   ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/PackageValidator.java"
-            line="94"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv4/media/PackageValidator.java"/>
     </issue>
 
     <issue
@@ -5536,9 +4532,7 @@
         errorLine1="    public boolean isCallerAllowed(Context context, String callingPackage, int callingUid) {"
         errorLine2="                                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/PackageValidator.java"
-            line="94"
-            column="53"/>
+            file="src/main/java/com/example/android/supportv4/media/PackageValidator.java"/>
     </issue>
 
     <issue
@@ -5547,9 +4541,7 @@
         errorLine1="    public Playback(MediaBrowserServiceSupport service, MusicProvider musicProvider) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/Playback.java"
-            line="97"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv4/media/Playback.java"/>
     </issue>
 
     <issue
@@ -5558,9 +4550,7 @@
         errorLine1="    public Playback(MediaBrowserServiceSupport service, MusicProvider musicProvider) {"
         errorLine2="                                                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/Playback.java"
-            line="97"
-            column="57"/>
+            file="src/main/java/com/example/android/supportv4/media/Playback.java"/>
     </issue>
 
     <issue
@@ -5569,9 +4559,7 @@
         errorLine1="    public void play(QueueItem item) {"
         errorLine2="                     ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/Playback.java"
-            line="146"
-            column="22"/>
+            file="src/main/java/com/example/android/supportv4/media/Playback.java"/>
     </issue>
 
     <issue
@@ -5580,9 +4568,7 @@
         errorLine1="    public void setCallback(Callback callback) {"
         errorLine2="                            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/Playback.java"
-            line="235"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/media/Playback.java"/>
     </issue>
 
     <issue
@@ -5591,9 +4577,7 @@
         errorLine1="    public QueueAdapter(Activity context) {"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueAdapter.java"
-            line="42"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueAdapter.java"/>
     </issue>
 
     <issue
@@ -5602,9 +4586,7 @@
         errorLine1="    public static QueueFragment newInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="133"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -5613,9 +4595,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="138"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -5624,9 +4604,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="138"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -5635,9 +4613,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="138"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -5646,9 +4622,7 @@
         errorLine1="                             Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"
-            line="139"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv4/media/QueueFragment.java"/>
     </issue>
 
     <issue
@@ -5657,9 +4631,7 @@
         errorLine1="    public static List&lt;MediaSessionCompat.QueueItem> getPlayingQueue(String mediaId,"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="40"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5668,9 +4640,7 @@
         errorLine1="    public static List&lt;MediaSessionCompat.QueueItem> getPlayingQueue(String mediaId,"
         errorLine2="                                                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="40"
-            column="70"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5679,9 +4649,7 @@
         errorLine1="            MusicProvider musicProvider) {"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="41"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5690,9 +4658,7 @@
         errorLine1="    public static List&lt;MediaSessionCompat.QueueItem> getPlayingQueueFromSearch(String query,"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="71"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5701,9 +4667,7 @@
         errorLine1="    public static List&lt;MediaSessionCompat.QueueItem> getPlayingQueueFromSearch(String query,"
         errorLine2="                                                                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="71"
-            column="80"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5712,9 +4676,7 @@
         errorLine1="            MusicProvider musicProvider) {"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="72"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5723,9 +4685,7 @@
         errorLine1="    public static int getMusicIndexOnQueue(Iterable&lt;MediaSessionCompat.QueueItem> queue,"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="80"
-            column="44"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5734,9 +4694,7 @@
         errorLine1="             String mediaId) {"
         errorLine2="             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="81"
-            column="14"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5745,9 +4703,7 @@
         errorLine1="    public static int getMusicIndexOnQueue(Iterable&lt;MediaSessionCompat.QueueItem> queue,"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="92"
-            column="44"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5756,9 +4712,7 @@
         errorLine1="    public static List&lt;MediaSessionCompat.QueueItem> getRandomQueue(MusicProvider musicProvider) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="136"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5767,9 +4721,7 @@
         errorLine1="    public static List&lt;MediaSessionCompat.QueueItem> getRandomQueue(MusicProvider musicProvider) {"
         errorLine2="                                                                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="136"
-            column="69"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5778,9 +4730,7 @@
         errorLine1="    public static boolean isIndexPlayable(int index, List&lt;MediaSessionCompat.QueueItem> queue) {"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"
-            line="147"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java"/>
     </issue>
 
     <issue
@@ -5789,9 +4739,7 @@
         errorLine1="    public static int getThemeColor(Context context, int attribute, int defaultColor) {"
         errorLine2="                                    ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/media/utils/ResourceHelper.java"
-            line="37"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/media/utils/ResourceHelper.java"/>
     </issue>
 
     <issue
@@ -5800,9 +4748,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/graphics/RoundedBitmapDrawableActivity.java"
-            line="41"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/graphics/RoundedBitmapDrawableActivity.java"/>
     </issue>
 
     <issue
@@ -5811,9 +4757,7 @@
         errorLine1=" protected void onCreate(Bundle savedInstanceState)"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/SendResult.java"
-            line="43"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/app/SendResult.java"/>
     </issue>
 
     <issue
@@ -5822,9 +4766,7 @@
         errorLine1="    protected void onCreate(Bundle b) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/SharingReceiverSupport.java"
-            line="45"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/SharingReceiverSupport.java"/>
     </issue>
 
     <issue
@@ -5833,9 +4775,7 @@
         errorLine1="    protected void onCreate(Bundle b) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/SharingSupport.java"
-            line="51"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/SharingSupport.java"/>
     </issue>
 
     <issue
@@ -5844,9 +4784,7 @@
         errorLine1="    public void onShareTextClick(View v) {"
         errorLine2="                                 ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/SharingSupport.java"
-            line="66"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/SharingSupport.java"/>
     </issue>
 
     <issue
@@ -5855,9 +4793,7 @@
         errorLine1="    public void onShareFileClick(View v) {"
         errorLine2="                                 ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/SharingSupport.java"
-            line="74"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/app/SharingSupport.java"/>
     </issue>
 
     <issue
@@ -5866,9 +4802,7 @@
         errorLine1="    public void onShareMultipleFileClick(View v) {"
         errorLine2="                                         ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/SharingSupport.java"
-            line="95"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/app/SharingSupport.java"/>
     </issue>
 
     <issue
@@ -5877,9 +4811,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="45"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5888,9 +4820,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,"
         errorLine2="                        ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="45"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5899,9 +4829,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,"
         errorLine2="                                 ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="45"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5910,9 +4838,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,"
         errorLine2="                                                      ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="45"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5921,9 +4847,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,"
         errorLine2="                                                                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="45"
-            column="73"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5932,9 +4856,7 @@
         errorLine1="            String sortOrder) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="46"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5943,9 +4865,7 @@
         errorLine1="    public String getType(Uri uri) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5954,9 +4874,7 @@
         errorLine1="    public String getType(Uri uri) {"
         errorLine2="                          ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="51"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5965,9 +4883,7 @@
         errorLine1="    public Uri insert(Uri uri, ContentValues values) {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="60"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5976,9 +4892,7 @@
         errorLine1="    public Uri insert(Uri uri, ContentValues values) {"
         errorLine2="                      ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="60"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5987,9 +4901,7 @@
         errorLine1="    public Uri insert(Uri uri, ContentValues values) {"
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="60"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -5998,9 +4910,7 @@
         errorLine1="    public int delete(Uri uri, String selection, String[] selectionArgs) {"
         errorLine2="                      ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="65"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6009,9 +4919,7 @@
         errorLine1="    public int delete(Uri uri, String selection, String[] selectionArgs) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="65"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6020,9 +4928,7 @@
         errorLine1="    public int delete(Uri uri, String selection, String[] selectionArgs) {"
         errorLine2="                                                 ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="65"
-            column="50"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6031,9 +4937,7 @@
         errorLine1="    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {"
         errorLine2="                      ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="70"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6042,9 +4946,7 @@
         errorLine1="    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {"
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="70"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6053,9 +4955,7 @@
         errorLine1="    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="70"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6064,9 +4964,7 @@
         errorLine1="    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {"
         errorLine2="                                                                       ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="70"
-            column="72"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6075,9 +4973,7 @@
         errorLine1="    public ParcelFileDescriptor openFile(Uri uri, String mode) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="75"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6086,9 +4982,7 @@
         errorLine1="    public ParcelFileDescriptor openFile(Uri uri, String mode) {"
         errorLine2="                                         ~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="75"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6097,9 +4991,7 @@
         errorLine1="    public ParcelFileDescriptor openFile(Uri uri, String mode) {"
         errorLine2="                                                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"
-            line="75"
-            column="51"/>
+            file="src/main/java/com/example/android/supportv4/content/SharingSupportProvider.java"/>
     </issue>
 
     <issue
@@ -6108,9 +5000,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/app/SimpleJobIntentController.java"
-            line="31"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/app/SimpleJobIntentController.java"/>
     </issue>
 
     <issue
@@ -6119,9 +5009,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="39"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6130,9 +5018,7 @@
         errorLine1="    protected List&lt;Map&lt;String, Object>> getData(String prefix) {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="56"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6141,9 +5027,7 @@
         errorLine1="    protected List&lt;Map&lt;String, Object>> getData(String prefix) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="56"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6152,9 +5036,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="123"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6163,9 +5045,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="123"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6174,9 +5054,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="123"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6185,9 +5063,7 @@
         errorLine1="    protected Intent browseIntent(String path) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="129"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6196,9 +5072,7 @@
         errorLine1="    protected Intent browseIntent(String path) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="129"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6207,9 +5081,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="136"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6218,9 +5090,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                                                           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="136"
-            column="60"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6229,9 +5099,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                                                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/Support4Demos.java"
-            line="136"
-            column="73"/>
+            file="src/main/java/com/example/android/supportv4/Support4Demos.java"/>
     </issue>
 
     <issue
@@ -6240,9 +5108,7 @@
         errorLine1="    public void onCreate(Bundle bundle) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/widget/SwipeRefreshLayoutActivityList.java"
-            line="31"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv4/widget/SwipeRefreshLayoutActivityList.java"/>
     </issue>
 
     <issue
@@ -6251,9 +5117,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv4/view/ViewPagerActivity.java"
-            line="38"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv4/view/ViewPagerActivity.java"/>
     </issue>
 
 </issues>
diff --git a/samples/Support7Demos/lint-baseline.xml b/samples/Support7Demos/lint-baseline.xml
index d18af073..73e649d 100644
--- a/samples/Support7Demos/lint-baseline.xml
+++ b/samples/Support7Demos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                android:onClick=&quot;onAddTab&quot; />"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/layout/action_bar_tabs.xml"
-            line="32"
-            column="17"/>
+            file="src/main/res/layout/action_bar_tabs.xml"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                android:onClick=&quot;onRemoveTab&quot; />"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/layout/action_bar_tabs.xml"
-            line="37"
-            column="17"/>
+            file="src/main/res/layout/action_bar_tabs.xml"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                android:onClick=&quot;onToggleTabs&quot; />"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/layout/action_bar_tabs.xml"
-            line="42"
-            column="17"/>
+            file="src/main/res/layout/action_bar_tabs.xml"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                android:onClick=&quot;onRemoveAllTabs&quot; />"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/layout/action_bar_tabs.xml"
-            line="47"
-            column="17"/>
+            file="src/main/res/layout/action_bar_tabs.xml"/>
     </issue>
 
     <issue
@@ -51,13 +43,9 @@
         errorLine1="        &lt;WebView"
         errorLine2="         ~~~~~~~">
         <location
-            file="src/main/res/layout/appcompat_night_mode.xml"
-            line="79"
-            column="10"/>
+            file="src/main/res/layout/appcompat_night_mode.xml"/>
         <location
             file="src/main/res/layout/appcompat_night_mode.xml"
-            line="23"
-            column="9"
             message="`wrap_content` here may not work well with WebView below"/>
     </issue>
 
@@ -67,9 +55,7 @@
         errorLine1="                        .detectImplicitDirectBoot()"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"
-            line="58"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"/>
     </issue>
 
     <issue
@@ -78,9 +64,7 @@
         errorLine1="        getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="41"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -89,9 +73,7 @@
         errorLine1="        getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="45"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -100,9 +82,7 @@
         errorLine1="        getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="49"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -111,9 +91,7 @@
         errorLine1="        getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_TIME);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="53"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -122,9 +100,7 @@
         errorLine1="        getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="57"
-            column="23"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -133,9 +109,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="41"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -144,9 +118,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="47"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -155,9 +127,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="53"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -166,9 +136,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_TIME);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="59"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -177,9 +145,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="65"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -188,9 +154,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="42"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -199,9 +163,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="51"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -210,9 +172,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="60"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -221,9 +181,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_TIME);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="69"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -232,9 +190,7 @@
         errorLine1="        dialog.getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="78"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -243,9 +199,7 @@
         errorLine1="                } catch (WindowManager.InvalidDisplayException ex) {"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="444"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -254,9 +208,7 @@
         errorLine1="    class=&quot;com.example.android.supportv7.drawable.MyDrawable&quot;"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/my_drawable.xml"
-            line="19"
-            column="5"/>
+            file="src/main/res/drawable/my_drawable.xml"/>
     </issue>
 
     <issue
@@ -265,9 +217,7 @@
         errorLine1="        android:showAsAction=&quot;always&quot;"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="22"
-            column="9"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -276,9 +226,7 @@
         errorLine1="        android:actionViewClass=&quot;androidx.appcompat.widget.SearchView&quot; />"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="23"
-            column="9"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -287,9 +235,7 @@
         errorLine1="        android:showAsAction=&quot;always&quot;"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="25"
-            column="9"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -298,9 +244,7 @@
         errorLine1="        android:actionProviderClass=&quot;androidx.appcompat.widget.ShareActionProvider&quot; />"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="27"
-            column="9"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -309,9 +253,7 @@
         errorLine1="            android:showAsAction=&quot;never&quot; />"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="32"
-            column="13"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -320,9 +262,7 @@
         errorLine1="            android:showAsAction=&quot;never&quot; />"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="36"
-            column="13"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -331,9 +271,7 @@
         errorLine1="            android:showAsAction=&quot;never&quot; />"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="43"
-            column="13"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -342,9 +280,7 @@
         errorLine1="        android:showAsAction=&quot;ifRoom&quot; />"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="48"
-            column="9"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -353,9 +289,7 @@
         errorLine1="        android:showAsAction=&quot;ifRoom&quot;>"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/menu/content_actions.xml"
-            line="52"
-            column="9"/>
+            file="src/main/res/menu/content_actions.xml"/>
     </issue>
 
     <issue
@@ -364,9 +298,7 @@
         errorLine1="                        .detectImplicitDirectBoot()"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"
-            line="58"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"/>
     </issue>
 
     <issue
@@ -375,9 +307,7 @@
         errorLine1="            if (view.showContextMenu(x, y)) {"
         errorLine2="                     ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="413"
-            column="22"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -386,9 +316,7 @@
         errorLine1="            if (mPresentation != null &amp;&amp; mPresentation.getDisplay() != presentationDisplay) {"
         errorLine2="                                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="430"
-            column="56"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -397,9 +325,7 @@
         errorLine1="            NotificationChannel channel = new NotificationChannel("
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="184"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -408,9 +334,7 @@
         errorLine1="            channel.setDescription(description);"
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="186"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -419,9 +343,7 @@
         errorLine1="                    mContext.getSystemService(NotificationManager.class);"
         errorLine2="                             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="190"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -430,9 +352,7 @@
         errorLine1="            notificationManager.createNotificationChannel(channel);"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="191"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -441,9 +361,7 @@
         errorLine1="        if (Build.VERSION.SDK_INT >= 23 &amp;&amp; !Settings.canDrawOverlays(getContext())) {"
         errorLine2="                                                     ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java"
-            line="252"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java"/>
     </issue>
 
     <issue
@@ -459,9 +377,7 @@
         errorLine1="                startActionMode();"
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarActionMode.java"
-            line="43"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarActionMode.java"/>
     </issue>
 
     <issue
@@ -470,9 +386,7 @@
         errorLine1="                    getContext().startActivity(sSettingsIntent);"
         errorLine2="                                               ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java"
-            line="81"
-            column="48"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java"/>
     </issue>
 
     <issue
@@ -481,9 +395,7 @@
         errorLine1="                showSelectedDialog();"
         errorLine2="                ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AlertDialogUsage.java"
-            line="48"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/app/AlertDialogUsage.java"/>
     </issue>
 
     <issue
@@ -492,9 +404,7 @@
         errorLine1="                if (isChecked &amp;&amp; mRecyclerView.getItemAnimator() == null) {"
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="84"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -503,9 +413,7 @@
         errorLine1="                    mRecyclerView.setItemAnimator(mCachedAnimator);"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="85"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -514,9 +422,7 @@
         errorLine1="                } else if (!isChecked &amp;&amp; mRecyclerView.getItemAnimator() != null) {"
         errorLine2="                                         ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="86"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -525,9 +431,7 @@
         errorLine1="                    mRecyclerView.setItemAnimator(null);"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="87"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -536,9 +440,7 @@
         errorLine1="                return new MyItemInfo();"
         errorLine2="                       ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="258"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -547,9 +449,7 @@
         errorLine1="                            outRange[0] = mLinearLayoutManager.findFirstVisibleItemPosition();"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"
-            line="144"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"/>
     </issue>
 
     <issue
@@ -558,9 +458,7 @@
         errorLine1="                            outRange[1] = mLinearLayoutManager.findLastVisibleItemPosition();"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"
-            line="145"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"/>
     </issue>
 
     <issue
@@ -569,9 +467,7 @@
         errorLine1="                            mRecyclerView.getAdapter().notifyDataSetChanged();"
         errorLine2="                            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"
-            line="150"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"/>
     </issue>
 
     <issue
@@ -580,9 +476,7 @@
         errorLine1="                            mRecyclerView.getAdapter().notifyItemChanged(position);"
         errorLine2="                            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"
-            line="155"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"/>
     </issue>
 
     <issue
@@ -591,9 +485,7 @@
         errorLine1="            mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"
-            line="159"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"/>
     </issue>
 
     <issue
@@ -602,9 +494,7 @@
         errorLine1="            ConfigToggle toggle = mConfigToggles[position];"
         errorLine2="                                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"
-            line="184"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -613,9 +503,7 @@
         errorLine1="            return mConfigToggles.length;"
         errorLine2="                   ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"
-            line="190"
-            column="20"/>
+            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -624,9 +512,7 @@
         errorLine1="            update();"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"
-            line="56"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"/>
     </issue>
 
     <issue
@@ -635,9 +521,7 @@
         errorLine1="                update();"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"
-            line="145"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"/>
     </issue>
 
     <issue
@@ -646,9 +530,7 @@
         errorLine1="                update();"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"
-            line="157"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"/>
     </issue>
 
     <issue
@@ -657,9 +539,7 @@
         errorLine1="                                        getColorId(checkedId)));"
         errorLine2="                                        ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"
-            line="167"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"/>
     </issue>
 
     <issue
@@ -668,9 +548,7 @@
         errorLine1="                return DemoItemHolder.this.mKey;"
         errorLine2="                                           ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/DemoItemHolder.java"
-            line="63"
-            column="44"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/DemoItemHolder.java"/>
     </issue>
 
     <issue
@@ -679,9 +557,7 @@
         errorLine1="                Log.d(TAG, &quot;Unexpected click received on item: &quot; + mDetails.getSelectionKey());"
         errorLine2="                                                                   ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/DemoItemHolder.java"
-            line="87"
-            column="68"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/DemoItemHolder.java"/>
     </issue>
 
     <issue
@@ -690,9 +566,7 @@
         errorLine1="                showSelectedDialog();"
         errorLine2="                ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"
-            line="53"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"/>
     </issue>
 
     <issue
@@ -701,9 +575,7 @@
         errorLine1="                        List&lt;String> newList = createRandomCheeseList(oldList, 5);"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/util/DiffUtilActivity.java"
-            line="81"
-            column="48"/>
+            file="src/main/java/com/example/android/supportv7/util/DiffUtilActivity.java"/>
     </issue>
 
     <issue
@@ -712,9 +584,7 @@
         errorLine1="        mStartDrawer.setOnItemClickListener(new DrawerItemClickListener());"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="111"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -723,9 +593,7 @@
         errorLine1="                        final int drawerLayoutWidth = mDrawerLayout.getWidth();"
         errorLine2="                                                      ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="164"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -734,9 +602,7 @@
         errorLine1="                        final Resources.Theme theme = mDrawerLayout.getContext().getTheme();"
         errorLine2="                                                      ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="167"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -745,9 +611,7 @@
         errorLine1="                                (DrawerLayout.LayoutParams) mStartDrawer.getLayoutParams();"
         errorLine2="                                                            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="181"
-            column="61"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -756,9 +620,7 @@
         errorLine1="                        mStartDrawer.setLayoutParams(startDrawerLp);"
         errorLine2="                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="183"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -767,9 +629,7 @@
         errorLine1="                                (DrawerLayout.LayoutParams) mEndDrawer.getLayoutParams();"
         errorLine2="                                                            ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="186"
-            column="61"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -778,9 +638,7 @@
         errorLine1="                        mEndDrawer.setLayoutParams(endDrawerLp);"
         errorLine2="                        ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="188"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -789,9 +647,7 @@
         errorLine1="                        mDrawerLayout.getViewTreeObserver().removeOnPreDrawListener(this);"
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="192"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -800,9 +656,7 @@
         errorLine1="            mContent.setText(LoremIpsum.DIALOGUE[position]);"
         errorLine2="            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="255"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -811,9 +665,7 @@
         errorLine1="            mToolbar.setTitle(LoremIpsum.TITLES[position]);"
         errorLine2="            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="256"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -822,9 +674,7 @@
         errorLine1="            mDrawerLayout.closeDrawer(mStartDrawer);"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="257"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -833,9 +683,7 @@
         errorLine1="            mDrawerLayout.closeDrawer(mStartDrawer);"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="257"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -844,9 +692,7 @@
         errorLine1="                switch(mAdapter.getItemViewType(position)){"
         errorLine2="                       ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="90"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -855,9 +701,7 @@
         errorLine1="                        return mLayout.getSpanCount();"
         errorLine2="                               ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="92"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -866,9 +710,7 @@
         errorLine1="                .withOnDragInitiatedListener(new OnDragInitiatedListener(this))"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="121"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -877,9 +719,7 @@
         errorLine1="                .withOnContextClickListener(new OnContextClickListener())"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="123"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -888,9 +728,7 @@
         errorLine1="                .withFocusDelegate(new FocusDelegate())"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="127"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -899,9 +737,7 @@
         errorLine1="                        if (mSelectionTracker.hasSelection() &amp;&amp; !mSwipeDuringSelectionEnabled) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="156"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -910,9 +746,7 @@
         errorLine1="                        if (mSelectionTracker.hasSelection() &amp;&amp; !mSwipeDuringSelectionEnabled) {"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="156"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -921,9 +755,7 @@
         errorLine1="                            mAdapter.removeItem(details.getSelectionKey());"
         errorLine2="                            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="181"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -932,9 +764,7 @@
         errorLine1="            toast(mContext, &quot;Activate item: &quot; + item);"
         errorLine2="            ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="396"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -943,9 +773,7 @@
         errorLine1="            View view = mRecView.findChildViewUnder(e.getX(), e.getY());"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="407"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -954,9 +782,7 @@
         errorLine1="            if (!mSwipeDuringSelectionEnabled) {"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="436"
-            column="18"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -965,9 +791,7 @@
         errorLine1="                toast(mContext, &quot;onDragInitiated received.&quot;);"
         errorLine2="                ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"
-            line="437"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -976,9 +800,7 @@
         errorLine1="                    CACHE.put(id, bitmap);"
         errorLine2="                    ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/ImageLoader.java"
-            line="77"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/graphics/ImageLoader.java"/>
     </issue>
 
     <issue
@@ -987,9 +809,7 @@
         errorLine1="                ConfigToggle toggle = mConfigToggles[position];"
         errorLine2="                                      ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="85"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -998,9 +818,7 @@
         errorLine1="                return mConfigToggles.length;"
         errorLine2="                       ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="91"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -1009,9 +827,7 @@
         errorLine1="                        if (mDividerItemDecoration != null) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"
-            line="61"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -1020,9 +836,7 @@
         errorLine1="                            mDividerItemDecoration.setOrientation(mLayoutManager.getOrientation());"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"
-            line="62"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -1031,9 +845,7 @@
         errorLine1="                        return mSnapHelperAttached;"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"
-            line="105"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -1042,9 +854,7 @@
         errorLine1="                        mLinearSnapHelper.attachToRecyclerView(newValue ? mRecyclerView : null);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"
-            line="110"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -1053,9 +863,7 @@
         errorLine1="                        mSnapHelperAttached = newValue;"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"
-            line="111"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -1064,9 +872,7 @@
         errorLine1="                if (mBindSlowdownEnabled) spinWaitMs(8);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="52"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -1075,9 +881,7 @@
         errorLine1="                if (mBindSlowdownEnabled) spinWaitMs(8);"
         errorLine2="                                          ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="52"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -1086,9 +890,7 @@
         errorLine1="                if (mInflateSlowdownEnabled) spinWaitMs(4);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="57"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -1097,9 +899,7 @@
         errorLine1="                if (mInflateSlowdownEnabled) spinWaitMs(4);"
         errorLine2="                                             ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="57"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -1108,9 +908,7 @@
         errorLine1="                    public boolean isChecked() { return mBindSlowdownEnabled; }"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="68"
-            column="57"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -1119,9 +917,7 @@
         errorLine1="                    public void onChange(boolean newValue) { mBindSlowdownEnabled = newValue; }"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="71"
-            column="62"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -1130,9 +926,7 @@
         errorLine1="                    public boolean isChecked() { return mInflateSlowdownEnabled; }"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="75"
-            column="57"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -1141,9 +935,7 @@
         errorLine1="                    public void onChange(boolean newValue) { mInflateSlowdownEnabled = newValue; }"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="78"
-            column="62"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -1152,9 +944,7 @@
         errorLine1="                mListPopupWindow = new ListPopupWindow(mContainer.getContext());"
         errorLine2="                                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="72"
-            column="56"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1163,9 +953,7 @@
         errorLine1="                mListPopupWindow = new ListPopupWindow(mContainer.getContext());"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="72"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1174,9 +962,7 @@
         errorLine1="                mListPopupAdapter = new BaseAdapter() {"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="76"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1185,9 +971,7 @@
         errorLine1="                            viewHolder.title = (TextView) convertView.findViewById(R.id.title);"
         errorLine2="                                       ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="104"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1196,9 +980,7 @@
         errorLine1="                            viewHolder.shortcut = (TextView) convertView.findViewById("
         errorLine2="                                       ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="105"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1207,9 +989,7 @@
         errorLine1="                        viewHolder.title.setText(POPUP_CONTENT[position]);"
         errorLine2="                                   ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="111"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1218,9 +998,7 @@
         errorLine1="                        viewHolder.shortcut.setVisibility(View.GONE);"
         errorLine2="                                   ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="112"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1229,9 +1007,7 @@
         errorLine1="                mListPopupWindow.setAdapter(mListPopupAdapter);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="117"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1240,9 +1016,7 @@
         errorLine1="                mListPopupWindow.setAdapter(mListPopupAdapter);"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="117"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1251,9 +1025,7 @@
         errorLine1="                mListPopupWindow.setAnchorView(mButton);"
         errorLine2="                                               ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="118"
-            column="48"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1262,9 +1034,7 @@
         errorLine1="                mListPopupWindow.setAnchorView(mButton);"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="118"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1273,9 +1043,7 @@
         errorLine1="                final Rect epicenter = mUseEpicenter.isChecked()"
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="121"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1284,9 +1052,7 @@
         errorLine1="                mListPopupWindow.setEpicenterBounds(epicenter);"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="123"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1295,9 +1061,7 @@
         errorLine1="                mListPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="127"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1306,9 +1070,7 @@
         errorLine1="                        addToLog(&quot;Item #&quot;+ position + &quot; clicked&quot;);"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="131"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1317,9 +1079,7 @@
         errorLine1="                        addToLog(&quot;Dismissing popup window&quot;);"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="132"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1328,9 +1088,7 @@
         errorLine1="                        mListPopupWindow.dismiss();"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="133"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1339,9 +1097,7 @@
         errorLine1="                mListPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="138"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1350,9 +1106,7 @@
         errorLine1="                        addToLog(&quot;Popup window dismissed&quot;);"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="141"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1361,9 +1115,7 @@
         errorLine1="                mListPopupWindow.setModal(mIsModal.isChecked());"
         errorLine2="                                          ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="146"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1372,9 +1124,7 @@
         errorLine1="                mListPopupWindow.setModal(mIsModal.isChecked());"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="146"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1383,9 +1133,7 @@
         errorLine1="                mListPopupWindow.show();"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="149"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1394,9 +1142,7 @@
         errorLine1="                addToLog(&quot;Log view clicked&quot;);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="159"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -1405,9 +1151,7 @@
         errorLine1="                if (mState == STATE_IDLE) {"
         errorLine2="                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="222"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1416,9 +1160,7 @@
         errorLine1="                    mState = STATE_READY;"
         errorLine2="                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="223"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1427,9 +1169,7 @@
         errorLine1="                    updateVideoRect();"
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="224"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1438,9 +1178,7 @@
         errorLine1="                } else if (mState == STATE_PREPARING_FOR_PLAY"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="225"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1449,9 +1187,7 @@
         errorLine1="                        || mState == STATE_PREPARING_FOR_PAUSE) {"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="226"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1460,9 +1196,7 @@
         errorLine1="                    int prevState = mState;"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="227"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1471,9 +1205,7 @@
         errorLine1="                    mState = mState == STATE_PREPARING_FOR_PLAY ? STATE_PLAYING : STATE_PAUSED;"
         errorLine2="                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="228"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1482,9 +1214,7 @@
         errorLine1="                    mState = mState == STATE_PREPARING_FOR_PLAY ? STATE_PLAYING : STATE_PAUSED;"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="228"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1493,9 +1223,7 @@
         errorLine1="                    updateVideoRect();"
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="229"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1504,9 +1232,7 @@
         errorLine1="                    if (mSeekToPos > 0) {"
         errorLine2="                        ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="230"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1515,9 +1241,7 @@
         errorLine1="                        if (DEBUG) {"
         errorLine2="                            ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="231"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1526,9 +1250,7 @@
         errorLine1="                            Log.d(TAG, &quot;seek to initial pos: &quot; + mSeekToPos);"
         errorLine2="                                                                 ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="232"
-            column="66"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1537,9 +1259,7 @@
         errorLine1="                        mMediaPlayer.seekTo(mSeekToPos);"
         errorLine2="                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="234"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1548,9 +1268,7 @@
         errorLine1="                        mMediaPlayer.seekTo(mSeekToPos);"
         errorLine2="                                            ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="234"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1559,9 +1277,7 @@
         errorLine1="                        mMediaPlayer.start();"
         errorLine2="                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="237"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1570,9 +1286,7 @@
         errorLine1="                mSeekToPos = 0;"
         errorLine2="                ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="287"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1581,9 +1295,7 @@
         errorLine1="                if (mMediaPlayer == null) {"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="323"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1592,9 +1304,7 @@
         errorLine1="                if (mSurface != null) {"
         errorLine2="                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="327"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1603,9 +1313,7 @@
         errorLine1="                    ICSMediaPlayer.setSurface(mMediaPlayer, mSurface);"
         errorLine2="                                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="328"
-            column="47"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1614,9 +1322,7 @@
         errorLine1="                    ICSMediaPlayer.setSurface(mMediaPlayer, mSurface);"
         errorLine2="                                                            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="328"
-            column="61"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1625,9 +1331,7 @@
         errorLine1="                } else if (mSurfaceHolder != null) {"
         errorLine2="                           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="329"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1636,9 +1340,7 @@
         errorLine1="                    mMediaPlayer.setDisplay(mSurfaceHolder);"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="330"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1647,9 +1349,7 @@
         errorLine1="                    mMediaPlayer.setDisplay(mSurfaceHolder);"
         errorLine2="                                            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="330"
-            column="45"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1658,9 +1358,7 @@
         errorLine1="                    mMediaPlayer.setDisplay(null);"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="332"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1669,9 +1367,7 @@
         errorLine1="            if (DEBUG) {"
         errorLine2="                ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="458"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1680,9 +1376,7 @@
         errorLine1="            if (DEBUG) {"
         errorLine2="                ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="466"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1691,9 +1385,7 @@
         errorLine1="            if (DEBUG) {"
         errorLine2="                ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="475"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1702,9 +1394,7 @@
         errorLine1="                if (dialog == mPresentation) {"
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="529"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1713,9 +1403,7 @@
         errorLine1="                    mPresentation = null;"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="531"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1724,9 +1412,7 @@
         errorLine1="                    updateContents();"
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="532"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -1735,9 +1421,7 @@
         errorLine1="            holder.mRecyclerView.swapAdapter(mAdapters.get(position), true);"
         errorLine2="                   ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="162"
-            column="20"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -1746,9 +1430,7 @@
         errorLine1="                holder.mRecyclerView.getLayoutManager().onRestoreInstanceState(savedState);"
         errorLine2="                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="166"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -1757,9 +1439,7 @@
         errorLine1="                    holder.mRecyclerView.getLayoutManager().onSaveInstanceState());"
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="174"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -1768,9 +1448,7 @@
         errorLine1="                if (displayId == mDefaultDisplay.getDisplayId()) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="405"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1779,9 +1457,7 @@
         errorLine1="                    if (updateDefaultDisplayInfo()) {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="406"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1790,9 +1466,7 @@
         errorLine1="                        relayout();"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="407"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1801,9 +1475,7 @@
         errorLine1="                if (displayId == mDefaultDisplay.getDisplayId()) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="416"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1812,9 +1484,7 @@
         errorLine1="                mGestureDetector.onTouchEvent(event);"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="458"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1823,9 +1493,7 @@
         errorLine1="                mScaleGestureDetector.onTouchEvent(event);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="459"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1834,9 +1502,7 @@
         errorLine1="                        saveWindowParams();"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="464"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1845,9 +1511,7 @@
         errorLine1="                mLiveTranslationX -= distanceX;"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="479"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1856,9 +1520,7 @@
         errorLine1="                mLiveTranslationY -= distanceY;"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="480"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1867,9 +1529,7 @@
         errorLine1="                relayout();"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="481"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1878,9 +1538,7 @@
         errorLine1="                mLiveScale *= detector.getScaleFactor();"
         errorLine2="                ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="490"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1889,9 +1547,7 @@
         errorLine1="                relayout();"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="491"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -1900,9 +1556,7 @@
         errorLine1="                        new Palette.Builder(bitmap).maximumColorCount(mNumColors).generate("
         errorLine2="                                                                      ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="212"
-            column="71"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -1911,9 +1565,7 @@
         errorLine1="        mSwatchesPalette = new SwatchesPalette();"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="68"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -1922,9 +1574,7 @@
         errorLine1="                if (mCurrentToast != null) {"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="76"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -1933,9 +1583,7 @@
         errorLine1="                    mCurrentToast.cancel();"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="77"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -1944,9 +1592,7 @@
         errorLine1="                mCurrentToast = Toast.makeText(PaletteDetailActivity.this,"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="81"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -1955,9 +1601,7 @@
         errorLine1="                mCurrentToast.show();"
         errorLine2="                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="83"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -1966,9 +1610,7 @@
         errorLine1="                                populatePalette(palette);"
         errorLine2="                                ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="135"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -1977,9 +1619,7 @@
         errorLine1="            setBackgroundColor(view, getItem(position));"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="171"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -1988,9 +1628,7 @@
         errorLine1="                populateMenu(menuInflater, popupMenu.getMenu());"
         errorLine2="                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java"
-            line="75"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java"/>
     </issue>
 
     <issue
@@ -1999,9 +1637,7 @@
         errorLine1="                        addToLog(&quot;Item &apos;&quot;+ item.getTitle() + &quot;&apos; clicked&quot;);"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java"
-            line="87"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java"/>
     </issue>
 
     <issue
@@ -2010,9 +1646,7 @@
         errorLine1="                        addToLog(&quot;Popup menu dismissed&quot;);"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java"
-            line="96"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java"/>
     </issue>
 
     <issue
@@ -2021,9 +1655,7 @@
         errorLine1="            logStatus(&quot;onItemStatusChanged&quot;, sessionId, sessionStatus, itemId, itemStatus);"
         errorLine2="            ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="58"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2032,9 +1664,7 @@
         errorLine1="            logStatus(&quot;onSessionStatusChanged&quot;, sessionId, sessionStatus, null, null);"
         errorLine2="            ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="73"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2043,9 +1673,7 @@
         errorLine1="            if (DEBUG) {"
         errorLine2="                ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="81"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2054,9 +1682,7 @@
         errorLine1="                logStatus(&quot;play: succeeded&quot;, sessionId, sessionStatus, itemId, itemStatus);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="134"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2065,9 +1691,7 @@
         errorLine1="                logError(&quot;play: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="148"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2076,9 +1700,7 @@
         errorLine1="                logStatus(&quot;getStatus: succeeded&quot;, sessionId, sessionStatus, itemId, itemStatus);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="173"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2087,9 +1709,7 @@
         errorLine1="                logError(&quot;getStatus: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="190"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2098,9 +1718,7 @@
         errorLine1="                logStatus(&quot;pause: succeeded&quot;, sessionId, sessionStatus, null, null);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="210"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2109,9 +1727,7 @@
         errorLine1="                logError(&quot;pause: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="219"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2120,9 +1736,7 @@
         errorLine1="                logStatus(&quot;resume: succeeded&quot;, sessionId, sessionStatus, null, null);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="236"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2131,9 +1745,7 @@
         errorLine1="                logError(&quot;resume: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="245"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2142,9 +1754,7 @@
         errorLine1="                logStatus(&quot;stop: succeeded&quot;, sessionId, sessionStatus, null, null);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="263"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2153,9 +1763,7 @@
         errorLine1="                if (mClient.isSessionManagementSupported()) {"
         errorLine2="                    ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="264"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2164,9 +1772,7 @@
         errorLine1="                    endSession();"
         errorLine2="                    ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="265"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2175,9 +1781,7 @@
         errorLine1="                logError(&quot;stop: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="274"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2186,9 +1790,7 @@
         errorLine1="                logStatus(&quot;remove: succeeded&quot;, sessionId, sessionStatus, itemId, itemStatus);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="310"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2197,9 +1799,7 @@
         errorLine1="                logError(&quot;remove: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="315"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2208,9 +1808,7 @@
         errorLine1="                    if (DEBUG) {"
         errorLine2="                        ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="334"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2219,9 +1817,7 @@
         errorLine1="                        mSnapshot = data.getParcelable(SampleMediaRouteProvider.EXTRA_SNAPSHOT);"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="338"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2230,9 +1826,7 @@
         errorLine1="                logStatus(&quot;enqueue: succeeded&quot;, sessionId, sessionStatus, itemId, itemStatus);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="367"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2241,9 +1835,7 @@
         errorLine1="                    seekInternal(item);"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="370"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2252,9 +1844,7 @@
         errorLine1="                if (mEnqueuePending) {"
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="377"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2263,9 +1853,7 @@
         errorLine1="                    mEnqueuePending = false;"
         errorLine2="                    ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="378"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2274,9 +1862,7 @@
         errorLine1="                    for (PlaylistItem item : mTempQueue) {"
         errorLine2="                                             ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="379"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2285,9 +1871,7 @@
         errorLine1="                        enqueueInternal(item);"
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="380"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2296,9 +1880,7 @@
         errorLine1="                    mTempQueue.clear();"
         errorLine2="                    ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="382"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2307,9 +1889,7 @@
         errorLine1="                logError(&quot;enqueue: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="391"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2318,9 +1898,7 @@
         errorLine1="               logStatus(&quot;seek: succeeded&quot;, sessionId, sessionStatus, itemId, itemStatus);"
         errorLine2="               ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="409"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2329,9 +1907,7 @@
         errorLine1="               logError(&quot;seek: failed&quot;, error, code);"
         errorLine2="               ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="417"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2340,9 +1916,7 @@
         errorLine1="                logStatus(&quot;startSession: succeeded&quot;, sessionId, sessionStatus, null, null);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="426"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2351,9 +1925,7 @@
         errorLine1="                enqueueInternal(item);"
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="427"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2362,9 +1934,7 @@
         errorLine1="                logError(&quot;startSession: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="432"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2373,9 +1943,7 @@
         errorLine1="                logStatus(&quot;endSession: succeeded&quot;, sessionId, sessionStatus, null, null);"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="441"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2384,9 +1952,7 @@
         errorLine1="                logError(&quot;endSession: failed&quot;, error, code);"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="446"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -2395,9 +1961,7 @@
         errorLine1="            return mHelper.mSessionManager;"
         errorLine2="                           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java"
-            line="337"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java"/>
     </issue>
 
     <issue
@@ -2406,9 +1970,7 @@
         errorLine1="                    handleStatusChange(item);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java"
-            line="359"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java"/>
     </issue>
 
     <issue
@@ -2417,9 +1979,7 @@
         errorLine1="                        Log.i(TAG, &quot;Selection changed to: &quot; + mSelectionTracker.getSelection());"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java"
-            line="92"
-            column="63"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -2428,9 +1988,7 @@
         errorLine1="            toast(mContext, &quot;Activate item: &quot; + item.getSelectionKey());"
         errorLine2="            ~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java"
-            line="148"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -2439,9 +1997,7 @@
         errorLine1="                        Log.i(TAG, &quot;Selection changed to: &quot; + mSelectionTracker.getSelection());"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/single/SingleStableIdSelectionDemoActivity.java"
-            line="84"
-            column="63"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/single/SingleStableIdSelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -2450,9 +2006,7 @@
         errorLine1="                        mAdapter.addItem(new Item(text));"
         errorLine2="                        ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/util/SortedListActivity.java"
-            line="65"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/util/SortedListActivity.java"/>
     </issue>
 
     <issue
@@ -2461,9 +2015,7 @@
         errorLine1="            holder.mDataView.setText(mData.get(position).second);"
         errorLine2="                   ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"
-            line="133"
-            column="20"/>
+            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"/>
     </issue>
 
     <issue
@@ -2472,9 +2024,7 @@
         errorLine1="                        return mVertical;"
         errorLine2="                               ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"
-            line="44"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -2483,9 +2033,7 @@
         errorLine1="                        if (mVertical == newValue) {"
         errorLine2="                            ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"
-            line="49"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -2494,9 +2042,7 @@
         errorLine1="                        mVertical = newValue;"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"
-            line="52"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -2505,9 +2051,7 @@
         errorLine1="                mActionMode = null;"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/SystemUIModes.java"
-            line="355"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/view/SystemUIModes.java"/>
     </issue>
 
     <issue
@@ -2516,9 +2060,7 @@
         errorLine1="                mActivity.clearActionMode();"
         errorLine2="                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/SystemUIModes.java"
-            line="356"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/view/SystemUIModes.java"/>
     </issue>
 
     <issue
@@ -2527,9 +2069,7 @@
         errorLine1="                startActionMode();"
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarActionMode.java"
-            line="47"
-            column="17"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarActionMode.java"/>
     </issue>
 
     <issue
@@ -2538,9 +2078,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarActionMode.java"
-            line="36"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarActionMode.java"/>
     </issue>
 
     <issue
@@ -2549,9 +2087,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarBackgroundChange.java"
-            line="32"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarBackgroundChange.java"/>
     </issue>
 
     <issue
@@ -2560,9 +2096,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"
-            line="40"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"/>
     </issue>
 
     <issue
@@ -2571,9 +2105,7 @@
         errorLine1="    public void onTabSelected(Tab tab, FragmentTransaction ft) {"
         errorLine2="                              ~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"
-            line="127"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"/>
     </issue>
 
     <issue
@@ -2582,9 +2114,7 @@
         errorLine1="    public void onTabSelected(Tab tab, FragmentTransaction ft) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"
-            line="127"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"/>
     </issue>
 
     <issue
@@ -2593,9 +2123,7 @@
         errorLine1="    public void onTabUnselected(Tab tab, FragmentTransaction ft) {"
         errorLine2="                                ~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"
-            line="131"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"/>
     </issue>
 
     <issue
@@ -2604,9 +2132,7 @@
         errorLine1="    public void onTabUnselected(Tab tab, FragmentTransaction ft) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"
-            line="131"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"/>
     </issue>
 
     <issue
@@ -2615,9 +2141,7 @@
         errorLine1="    public void onTabReselected(Tab tab, FragmentTransaction ft) {"
         errorLine2="                                ~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"
-            line="135"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"/>
     </issue>
 
     <issue
@@ -2626,9 +2150,7 @@
         errorLine1="    public void onTabReselected(Tab tab, FragmentTransaction ft) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"
-            line="135"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java"/>
     </issue>
 
     <issue
@@ -2637,9 +2159,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="51"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2648,9 +2168,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="127"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2659,9 +2177,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, @NonNull MenuInflater inflater) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="133"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2670,9 +2186,7 @@
         errorLine1="        public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="140"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2681,9 +2195,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="160"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2692,9 +2204,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, @NonNull MenuInflater inflater) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="175"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2703,9 +2213,7 @@
         errorLine1="        public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="180"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2714,9 +2222,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="195"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2725,9 +2231,7 @@
         errorLine1="        public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"
-            line="223"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java"/>
     </issue>
 
     <issue
@@ -2736,9 +2240,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarHideOnScroll.java"
-            line="31"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarHideOnScroll.java"/>
     </issue>
 
     <issue
@@ -2747,9 +2249,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarMechanics.java"
-            line="33"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarMechanics.java"/>
     </issue>
 
     <issue
@@ -2758,9 +2258,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarMechanics.java"
-            line="69"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarMechanics.java"/>
     </issue>
 
     <issue
@@ -2769,9 +2267,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java"
-            line="49"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java"/>
     </issue>
 
     <issue
@@ -2780,9 +2276,7 @@
         errorLine1="        public SettingsActionProvider(Context context) {"
         errorLine2="                                      ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java"
-            line="67"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java"/>
     </issue>
 
     <issue
@@ -2791,9 +2285,7 @@
         errorLine1="        public View onCreateActionView() {"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java"
-            line="72"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java"/>
     </issue>
 
     <issue
@@ -2802,9 +2294,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarUsage.java"
-            line="44"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarUsage.java"/>
     </issue>
 
     <issue
@@ -2813,9 +2303,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ActionBarUsage.java"
-            line="74"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/ActionBarUsage.java"/>
     </issue>
 
     <issue
@@ -2824,9 +2312,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AlertDialogUsage.java"
-            line="38"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AlertDialogUsage.java"/>
     </issue>
 
     <issue
@@ -2835,9 +2321,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="60"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2846,9 +2330,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="345"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2857,9 +2339,7 @@
         errorLine1="    public void checkboxClicked(View view) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="351"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2868,9 +2348,7 @@
         errorLine1="    public void itemClicked(View view) {"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="359"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2879,9 +2357,7 @@
         errorLine1="    public void deleteSelectedItems(View view) {"
         errorLine2="                                    ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="370"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2890,9 +2366,7 @@
         errorLine1="    public void d1a2d3(View view) {"
         errorLine2="                       ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="383"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2901,9 +2375,7 @@
         errorLine1="    public void addDeleteItem(View view) {"
         errorLine2="                              ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="406"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2912,9 +2384,7 @@
         errorLine1="    public void deleteAddItem(View view) {"
         errorLine2="                              ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="411"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2923,9 +2393,7 @@
         errorLine1="    public void addItem(View view) {"
         errorLine2="                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"
-            line="416"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java"/>
     </issue>
 
     <issue
@@ -2934,9 +2402,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatAnimatedSelector.java"
-            line="35"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatAnimatedSelector.java"/>
     </issue>
 
     <issue
@@ -2945,9 +2411,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatAnimatedVector.java"
-            line="31"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatAnimatedVector.java"/>
     </issue>
 
     <issue
@@ -2956,9 +2420,7 @@
         errorLine1="    public void setModeNightFollowSystem(View view) {"
         errorLine2="                                         ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"
-            line="40"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -2967,9 +2429,7 @@
         errorLine1="    public void setModeNightNo(View view) {"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"
-            line="44"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -2978,9 +2438,7 @@
         errorLine1="    public void setModeNightYes(View view) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"
-            line="48"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -2989,9 +2447,7 @@
         errorLine1="    public void setModeNightAutoTime(View view) {"
         errorLine2="                                     ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"
-            line="52"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -3000,9 +2456,7 @@
         errorLine1="    public void setModeNightAutoBattery(View view) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"
-            line="56"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -3011,9 +2465,7 @@
         errorLine1="    public void setModeNightFollowSystem(View view) {"
         errorLine2="                                         ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"
-            line="71"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"/>
     </issue>
 
     <issue
@@ -3022,9 +2474,7 @@
         errorLine1="    public void setModeNightNo(View view) {"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"
-            line="75"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"/>
     </issue>
 
     <issue
@@ -3033,9 +2483,7 @@
         errorLine1="    public void setModeNightYes(View view) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"
-            line="79"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"/>
     </issue>
 
     <issue
@@ -3044,9 +2492,7 @@
         errorLine1="    public void setModeNightAutoTime(View view) {"
         errorLine2="                                     ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"
-            line="83"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"/>
     </issue>
 
     <issue
@@ -3055,9 +2501,7 @@
         errorLine1="    public void setModeNightAutoBattery(View view) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"
-            line="87"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatDefaultNightModeBootAwareActivity.java"/>
     </issue>
 
     <issue
@@ -3066,9 +2510,7 @@
         errorLine1="    public void setModeNightFollowSystem(View view) {"
         errorLine2="                                         ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="40"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -3077,9 +2519,7 @@
         errorLine1="    public void setModeNightNo(View view) {"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="44"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -3088,9 +2528,7 @@
         errorLine1="    public void setModeNightYes(View view) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="48"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -3099,9 +2537,7 @@
         errorLine1="    public void setModeNightAutoTime(View view) {"
         errorLine2="                                     ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="52"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -3110,9 +2546,7 @@
         errorLine1="    public void setModeNightAutoBattery(View view) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"
-            line="56"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatLocalNightModeActivity.java"/>
     </issue>
 
     <issue
@@ -3121,9 +2555,7 @@
         errorLine1="    public void setModeNightFollowSystem(View view) {"
         errorLine2="                                         ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="39"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -3132,9 +2564,7 @@
         errorLine1="    public void setModeNightNo(View view) {"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="45"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -3143,9 +2573,7 @@
         errorLine1="    public void setModeNightYes(View view) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="51"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -3154,9 +2582,7 @@
         errorLine1="    public void setModeNightAutoTime(View view) {"
         errorLine2="                                     ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="57"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -3165,9 +2591,7 @@
         errorLine1="    public void setModeNightAutoBattery(View view) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"
-            line="63"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java"/>
     </issue>
 
     <issue
@@ -3176,9 +2600,7 @@
         errorLine1="    public void launchActivity(View view) {"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeBounceActivity.java"
-            line="42"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeBounceActivity.java"/>
     </issue>
 
     <issue
@@ -3187,9 +2609,7 @@
         errorLine1="    public void setModeNightFollowSystem(View view) {"
         errorLine2="                                         ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="39"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -3198,9 +2618,7 @@
         errorLine1="    public void setModeNightNo(View view) {"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="48"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -3209,9 +2627,7 @@
         errorLine1="    public void setModeNightYes(View view) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="57"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -3220,9 +2636,7 @@
         errorLine1="    public void setModeNightAutoTime(View view) {"
         errorLine2="                                     ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="66"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -3231,9 +2645,7 @@
         errorLine1="    public void setModeNightAutoBattery(View view) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"
-            line="75"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java"/>
     </issue>
 
     <issue
@@ -3242,9 +2654,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsButtons.java"
-            line="30"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsButtons.java"/>
     </issue>
 
     <issue
@@ -3253,9 +2663,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsRatingBars.java"
-            line="30"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsRatingBars.java"/>
     </issue>
 
     <issue
@@ -3264,9 +2672,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsSpinners.java"
-            line="33"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsSpinners.java"/>
     </issue>
 
     <issue
@@ -3275,9 +2681,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsSwitches.java"
-            line="31"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsSwitches.java"/>
     </issue>
 
     <issue
@@ -3286,9 +2690,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextInput.java"
-            line="36"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextInput.java"/>
     </issue>
 
     <issue
@@ -3297,9 +2699,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextViews.java"
-            line="30"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextViews.java"/>
     </issue>
 
     <issue
@@ -3308,9 +2708,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsToggleButtons.java"
-            line="30"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/AppCompatWidgetsToggleButtons.java"/>
     </issue>
 
     <issue
@@ -3319,9 +2717,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"
-            line="46"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"/>
     </issue>
 
     <issue
@@ -3330,9 +2726,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"
-            line="68"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java"/>
     </issue>
 
     <issue
@@ -3341,9 +2735,7 @@
         errorLine1="    protected RecyclerView mRecyclerView;"
         errorLine2="              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"
-            line="51"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3352,9 +2744,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"
-            line="56"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3363,9 +2753,7 @@
         errorLine1="    protected void onRecyclerViewInit(RecyclerView recyclerView) {"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"
-            line="76"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3374,9 +2762,7 @@
         errorLine1="    protected RecyclerView.Adapter createAdapter() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"
-            line="80"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3385,9 +2771,7 @@
         errorLine1="    public void onScrollClicked(View view) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"
-            line="110"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3396,9 +2780,7 @@
         errorLine1="    protected ConfigToggle[] createConfigToggles() {"
         errorLine2="              ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"
-            line="171"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3407,9 +2789,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"
-            line="110"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/view/CardViewActivity.java"/>
     </issue>
 
     <issue
@@ -3418,9 +2798,7 @@
         errorLine1="    protected ConfigToggle(Context context, int labelId) {"
         errorLine2="                           ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/util/ConfigToggle.java"
-            line="24"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/widget/util/ConfigToggle.java"/>
     </issue>
 
     <issue
@@ -3429,9 +2807,7 @@
         errorLine1="    public String getText() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/util/ConfigToggle.java"
-            line="28"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/util/ConfigToggle.java"/>
     </issue>
 
     <issue
@@ -3440,9 +2816,7 @@
         errorLine1="    public ConfigViewHolder(View itemView) {"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/util/ConfigViewHolder.java"
-            line="32"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/util/ConfigViewHolder.java"/>
     </issue>
 
     <issue
@@ -3451,9 +2825,7 @@
         errorLine1="    public void bind(ConfigToggle toggle) {"
         errorLine2="                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/util/ConfigViewHolder.java"
-            line="38"
-            column="22"/>
+            file="src/main/java/com/example/android/supportv7/widget/util/ConfigViewHolder.java"/>
     </issue>
 
     <issue
@@ -3462,9 +2834,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/drawable/CustomDrawableActivity.java"
-            line="29"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/drawable/CustomDrawableActivity.java"/>
     </issue>
 
     <issue
@@ -3473,9 +2843,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"
-            line="43"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"/>
     </issue>
 
     <issue
@@ -3484,9 +2852,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"
-            line="105"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"/>
     </issue>
 
     <issue
@@ -3495,9 +2861,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"
-            line="113"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"/>
     </issue>
 
     <issue
@@ -3506,9 +2870,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"
-            line="113"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"/>
     </issue>
 
     <issue
@@ -3517,9 +2879,7 @@
         errorLine1="        public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"
-            line="118"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java"/>
     </issue>
 
     <issue
@@ -3528,9 +2888,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/DialogUsage.java"
-            line="35"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/DialogUsage.java"/>
     </issue>
 
     <issue
@@ -3539,9 +2897,7 @@
         errorLine1="    public void onBind(ItemTouchViewHolder viewHolder) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"
-            line="82"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"/>
     </issue>
 
     <issue
@@ -3550,9 +2906,7 @@
         errorLine1="    public void clearView(RecyclerView.ViewHolder viewHolder) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"
-            line="88"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"/>
     </issue>
 
     <issue
@@ -3561,9 +2915,7 @@
         errorLine1="    public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"
-            line="97"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"/>
     </issue>
 
     <issue
@@ -3572,9 +2924,7 @@
         errorLine1="    public ItemTouchViewHolder onCreateViewHolder(ViewGroup parent) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"
-            line="107"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"/>
     </issue>
 
     <issue
@@ -3583,9 +2933,7 @@
         errorLine1="    public ItemTouchViewHolder onCreateViewHolder(ViewGroup parent) {"
         errorLine2="                                                  ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"
-            line="107"
-            column="51"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"/>
     </issue>
 
     <issue
@@ -3594,9 +2942,7 @@
         errorLine1="    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {"
         errorLine2="                                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"
-            line="123"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"/>
     </issue>
 
     <issue
@@ -3605,9 +2951,7 @@
         errorLine1="    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"
-            line="123"
-            column="60"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java"/>
     </issue>
 
     <issue
@@ -3616,9 +2960,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="91"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -3627,9 +2969,7 @@
         errorLine1="    protected void onPostCreate(Bundle savedInstanceState) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="199"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -3638,9 +2978,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="207"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -3649,9 +2987,7 @@
         errorLine1="    public void onConfigurationChanged(Configuration newConfig) {"
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"
-            line="243"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java"/>
     </issue>
 
     <issue
@@ -3660,9 +2996,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/GridLayout1.java"
-            line="30"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/view/GridLayout1.java"/>
     </issue>
 
     <issue
@@ -3671,9 +3005,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/GridLayout2.java"
-            line="29"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/view/GridLayout2.java"/>
     </issue>
 
     <issue
@@ -3682,9 +3014,7 @@
         errorLine1="    public static View create(Context context) {"
         errorLine2="                  ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/GridLayout3.java"
-            line="52"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv7/view/GridLayout3.java"/>
     </issue>
 
     <issue
@@ -3693,9 +3023,7 @@
         errorLine1="    public static View create(Context context) {"
         errorLine2="                              ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/GridLayout3.java"
-            line="52"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/view/GridLayout3.java"/>
     </issue>
 
     <issue
@@ -3704,9 +3032,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/view/GridLayout3.java"
-            line="126"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/view/GridLayout3.java"/>
     </issue>
 
     <issue
@@ -3715,9 +3041,7 @@
         errorLine1="    protected GridLayoutManager createLayoutManager() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java"
-            line="37"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3726,9 +3050,7 @@
         errorLine1="    protected ConfigToggle[] createConfigToggles() {"
         errorLine2="              ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java"
-            line="53"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3737,9 +3059,7 @@
         errorLine1="    protected RecyclerView.Adapter createAdapter() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java"
-            line="115"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -3748,9 +3068,7 @@
         errorLine1="    public RecyclerView mRecyclerView;"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="49"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3759,9 +3077,7 @@
         errorLine1="    public ItemTouchAdapter mAdapter;"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3770,9 +3086,7 @@
         errorLine1="    public ItemTouchHelper mItemTouchHelper;"
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="53"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3781,9 +3095,7 @@
         errorLine1="    public ItemTouchHelper.Callback mCallback;"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="55"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3792,9 +3104,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="60"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3803,9 +3113,7 @@
         errorLine1="    public ItemTouchHelper createItemTouchHelper() {"
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="101"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3814,9 +3122,7 @@
         errorLine1="    public ItemTouchHelper.Callback createCallback() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="106"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3825,9 +3131,7 @@
         errorLine1="    public boolean onChildDraw(Canvas c, RecyclerView recyclerView,"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="181"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3836,9 +3140,7 @@
         errorLine1="    public boolean onChildDraw(Canvas c, RecyclerView recyclerView,"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="181"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3847,9 +3149,7 @@
         errorLine1="            RecyclerView.ViewHolder viewHolder,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="182"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3858,9 +3158,7 @@
         errorLine1="    public boolean onChildDrawOver(Canvas c, RecyclerView recyclerView,"
         errorLine2="                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="190"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3869,9 +3167,7 @@
         errorLine1="    public boolean onChildDrawOver(Canvas c, RecyclerView recyclerView,"
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="190"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3880,9 +3176,7 @@
         errorLine1="            RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="191"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3891,9 +3185,7 @@
         errorLine1="    public void clearView(RecyclerView.ViewHolder viewHolder) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="196"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3902,9 +3194,7 @@
         errorLine1="    public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="200"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3913,9 +3203,7 @@
         errorLine1="    public ItemTouchViewHolder onCreateViewHolder(ViewGroup parent) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="212"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3924,9 +3212,7 @@
         errorLine1="    public ItemTouchViewHolder onCreateViewHolder(ViewGroup parent) {"
         errorLine2="                                                  ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="212"
-            column="51"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3935,9 +3221,7 @@
         errorLine1="    abstract public int getMovementFlags(RecyclerView recyclerView,"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="218"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3946,9 +3230,7 @@
         errorLine1="            RecyclerView.ViewHolder viewHolder);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="219"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3957,9 +3239,7 @@
         errorLine1="    public ItemTouchAdapter createAdapter() {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="221"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3968,9 +3248,7 @@
         errorLine1="    public void onBind(ItemTouchViewHolder viewHolder) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="225"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3979,9 +3257,7 @@
         errorLine1="    public void onCreateViewHolder(ItemTouchViewHolder viewHolder) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="229"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -3990,9 +3266,7 @@
         errorLine1="        public ItemTouchViewHolder(View itemView) {"
         errorLine2="                                   ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="243"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -4001,9 +3275,7 @@
         errorLine1="        public ItemTouchViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="261"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -4012,9 +3284,7 @@
         errorLine1="        public ItemTouchViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="261"
-            column="55"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -4023,9 +3293,7 @@
         errorLine1="        public void onBindViewHolder(ItemTouchViewHolder holder, int position) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"
-            line="266"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java"/>
     </issue>
 
     <issue
@@ -4034,9 +3302,7 @@
         errorLine1="    protected LinearLayoutManager createLayoutManager() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"
-            line="37"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -4045,9 +3311,7 @@
         errorLine1="    protected void onRecyclerViewInit(RecyclerView recyclerView) {"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"
-            line="42"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -4056,9 +3320,7 @@
         errorLine1="    protected ConfigToggle[] createConfigToggles() {"
         errorLine2="              ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"
-            line="49"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -4067,9 +3329,7 @@
         errorLine1="    protected RecyclerView.Adapter createAdapter() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="47"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -4078,9 +3338,7 @@
         errorLine1="    protected ConfigToggle[] createConfigToggles() {"
         errorLine2="              ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"
-            line="64"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java"/>
     </issue>
 
     <issue
@@ -4089,9 +3347,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"
-            line="56"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java"/>
     </issue>
 
     <issue
@@ -4100,9 +3356,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/ListViewActivity.java"
-            line="36"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/ListViewActivity.java"/>
     </issue>
 
     <issue
@@ -4111,9 +3365,7 @@
         errorLine1="    public LocalPlayer(Context context) {"
         errorLine2="                       ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="70"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4122,9 +3374,7 @@
         errorLine1="    public void connect(RouteInfo route) {"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="88"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4133,9 +3383,7 @@
         errorLine1="    public void play(final PlaylistItem item) {"
         errorLine2="                           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="109"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4144,9 +3392,7 @@
         errorLine1="    public void seek(final PlaylistItem item) {"
         errorLine2="                           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="135"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4155,9 +3401,7 @@
         errorLine1="    public void getStatus(final PlaylistItem item, final boolean update) {"
         errorLine2="                                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="152"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4166,9 +3410,7 @@
         errorLine1="    public void enqueue(final PlaylistItem item) {"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="204"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4177,9 +3419,7 @@
         errorLine1="    public PlaylistItem remove(String iid) {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="209"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4188,9 +3428,7 @@
         errorLine1="    public PlaylistItem remove(String iid) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="209"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4199,9 +3437,7 @@
         errorLine1="    protected Context getContext() { return mContext; }"
         errorLine2="              ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="295"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4210,9 +3446,7 @@
         errorLine1="    protected MediaPlayer getMediaPlayer() { return mMediaPlayer; }"
         errorLine2="              ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="296"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4221,9 +3455,7 @@
         errorLine1="    protected void setSurface(Surface surface) {"
         errorLine2="                              ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="300"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4232,9 +3464,7 @@
         errorLine1="    protected void setSurface(SurfaceHolder surfaceHolder) {"
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="306"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4243,9 +3473,7 @@
         errorLine1="    protected void removeSurface(SurfaceHolder surfaceHolder) {"
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="312"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4254,9 +3482,7 @@
         errorLine1="        public SurfaceViewPlayer(Context context) {"
         errorLine2="                                 ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="389"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4265,9 +3491,7 @@
         errorLine1="        public void connect(RouteInfo route) {"
         errorLine2="                            ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="401"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4276,9 +3500,7 @@
         errorLine1="        public void surfaceChanged(SurfaceHolder holder, int format,"
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="456"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4287,9 +3509,7 @@
         errorLine1="        public void surfaceCreated(SurfaceHolder holder) {"
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="465"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4298,9 +3518,7 @@
         errorLine1="        public void surfaceDestroyed(SurfaceHolder holder) {"
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="474"
-            column="38"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4309,9 +3527,7 @@
         errorLine1="        public OverlayPlayer(Context context) {"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="597"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4320,9 +3536,7 @@
         errorLine1="        public void connect(RouteInfo route) {"
         errorLine2="                            ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="609"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4331,9 +3545,7 @@
         errorLine1="        public void onWindowCreated(Surface surface) {"
         errorLine2="                                    ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="631"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4342,9 +3554,7 @@
         errorLine1="        public void onWindowCreated(SurfaceHolder surfaceHolder) {"
         errorLine2="                                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="636"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4353,9 +3563,7 @@
         errorLine1="        public Bitmap getSnapshot() {"
         errorLine2="               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"
-            line="646"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/media/LocalPlayer.java"/>
     </issue>
 
     <issue
@@ -4364,9 +3572,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/MenuItemIconTinting.java"
-            line="35"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/MenuItemIconTinting.java"/>
     </issue>
 
     <issue
@@ -4375,9 +3581,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/MenuItemIconTinting.java"
-            line="53"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/MenuItemIconTinting.java"/>
     </issue>
 
     <issue
@@ -4386,9 +3590,7 @@
         errorLine1="    public void draw(Canvas canvas) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/drawable/MyDrawable.java"
-            line="38"
-            column="22"/>
+            file="src/main/java/com/example/android/supportv7/drawable/MyDrawable.java"/>
     </issue>
 
     <issue
@@ -4397,9 +3599,7 @@
         errorLine1="    public void setColorFilter(ColorFilter colorFilter) {"
         errorLine2="                               ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/drawable/MyDrawable.java"
-            line="54"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/drawable/MyDrawable.java"/>
     </issue>
 
     <issue
@@ -4408,9 +3608,7 @@
         errorLine1="    public MyMediaRouteControllerDialog(Context context) {"
         errorLine2="                                        ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java"
-            line="34"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java"/>
     </issue>
 
     <issue
@@ -4419,9 +3617,7 @@
         errorLine1="    public View onCreateMediaControlView(Bundle savedInstanceState) {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java"
-            line="39"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java"/>
     </issue>
 
     <issue
@@ -4430,9 +3626,7 @@
         errorLine1="    public View onCreateMediaControlView(Bundle savedInstanceState) {"
         errorLine2="                                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java"
-            line="39"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java"/>
     </issue>
 
     <issue
@@ -4441,9 +3635,7 @@
         errorLine1="    protected LinearLayoutManager createLayoutManager() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="44"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -4452,9 +3644,7 @@
         errorLine1="    protected void onRecyclerViewInit(RecyclerView recyclerView) {"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="49"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -4463,9 +3653,7 @@
         errorLine1="    protected ConfigToggle[] createConfigToggles() {"
         errorLine2="              ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="55"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -4474,9 +3662,7 @@
         errorLine1="            public ViewHolder(TextView itemView) {"
         errorLine2="                              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="77"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -4485,9 +3671,7 @@
         errorLine1="            public ViewHolder(RecyclerView itemView) {"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="114"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -4496,9 +3680,7 @@
         errorLine1="    protected RecyclerView.Adapter createAdapter() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"
-            line="184"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -4507,9 +3689,7 @@
         errorLine1="    protected OverlayWindowListener mListener;"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="62"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4518,9 +3698,7 @@
         errorLine1="    protected OverlayDisplayWindow(Context context, String name,"
         errorLine2="                                   ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="64"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4529,9 +3707,7 @@
         errorLine1="    protected OverlayDisplayWindow(Context context, String name,"
         errorLine2="                                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="64"
-            column="53"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4540,9 +3716,7 @@
         errorLine1="    public static OverlayDisplayWindow create(Context context, String name,"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="73"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4551,9 +3725,7 @@
         errorLine1="    public static OverlayDisplayWindow create(Context context, String name,"
         errorLine2="                                              ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="73"
-            column="47"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4562,9 +3734,7 @@
         errorLine1="    public static OverlayDisplayWindow create(Context context, String name,"
         errorLine2="                                                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="73"
-            column="64"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4573,9 +3743,7 @@
         errorLine1="    public void setOverlayWindowListener(OverlayWindowListener listener) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="82"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4584,9 +3752,7 @@
         errorLine1="    public Context getContext() {"
         errorLine2="           ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="86"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4595,9 +3761,7 @@
         errorLine1="    public abstract Bitmap getSnapshot();"
         errorLine2="                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="96"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4606,9 +3770,7 @@
         errorLine1="        void onWindowCreated(Surface surface);"
         errorLine2="                             ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="100"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4617,9 +3779,7 @@
         errorLine1="        void onWindowCreated(SurfaceHolder surfaceHolder);"
         errorLine2="                             ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"
-            line="101"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java"/>
     </issue>
 
     <issue
@@ -4628,9 +3788,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/PagerRecyclerViewActivity.java"
-            line="35"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/PagerRecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -4639,9 +3797,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="56"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4650,9 +3806,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="82"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4661,9 +3815,7 @@
         errorLine1="        public void onViewCreated(View view, Bundle savedInstanceState) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="88"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4672,9 +3824,7 @@
         errorLine1="        public void onViewCreated(View view, Bundle savedInstanceState) {"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="88"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4683,9 +3833,7 @@
         errorLine1="        public void onActivityCreated(Bundle savedInstanceState) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="96"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4694,9 +3842,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="109"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4705,9 +3851,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="109"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4716,9 +3860,7 @@
         errorLine1="        public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="114"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4727,9 +3869,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="142"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4738,9 +3878,7 @@
         errorLine1="        public void onListItemClick(ListView l, View v, int position, long id) {"
         errorLine2="                                                ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="142"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4749,9 +3887,7 @@
         errorLine1="        public Loader&lt;Cursor> onCreateLoader(int id, Bundle bundle) {"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="154"
-            column="54"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4760,9 +3896,7 @@
         errorLine1="        public void onLoadFinished(@NonNull Loader&lt;Cursor> cursorLoader, Cursor cursor) {"
         errorLine2="                                                                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"
-            line="165"
-            column="74"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java"/>
     </issue>
 
     <issue
@@ -4771,9 +3905,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="60"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -4782,9 +3914,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"
-            line="98"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java"/>
     </issue>
 
     <issue
@@ -4793,9 +3923,7 @@
         errorLine1="    protected Context mContext;"
         errorLine2="              ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="70"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4804,9 +3932,7 @@
         errorLine1="    protected Callback mCallback;"
         errorLine2="              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="71"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4815,9 +3941,7 @@
         errorLine1="    protected MediaSessionCompat mMediaSession;"
         errorLine2="              ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="72"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4826,9 +3950,7 @@
         errorLine1="    protected String mNotificationChannelId;"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="74"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4837,9 +3959,7 @@
         errorLine1="    public abstract void connect(RouteInfo route);"
         errorLine2="                                 ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="81"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4848,9 +3968,7 @@
         errorLine1="    public abstract void play(final PlaylistItem item);"
         errorLine2="                                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="85"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4859,9 +3977,7 @@
         errorLine1="    public abstract void seek(final PlaylistItem item);"
         errorLine2="                                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="86"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4870,9 +3986,7 @@
         errorLine1="    public abstract void getStatus(final PlaylistItem item, final boolean update);"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="87"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4881,9 +3995,7 @@
         errorLine1="    public abstract void enqueue(final PlaylistItem item);"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="94"
-            column="40"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4892,9 +4004,7 @@
         errorLine1="    public abstract PlaylistItem remove(String iid);"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="95"
-            column="21"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4903,9 +4013,7 @@
         errorLine1="    public abstract PlaylistItem remove(String iid);"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="95"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4914,9 +4022,7 @@
         errorLine1="    public Bitmap getSnapshot() { return null; }"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="98"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4925,9 +4031,7 @@
         errorLine1="    public void setCallback(Callback callback) {"
         errorLine2="                            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="106"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4936,9 +4040,7 @@
         errorLine1="    public static Player create(Context context, RouteInfo route, MediaSessionCompat session) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="110"
-            column="19"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4947,9 +4049,7 @@
         errorLine1="    public static Player create(Context context, RouteInfo route, MediaSessionCompat session) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="110"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4958,9 +4058,7 @@
         errorLine1="    public static Player create(Context context, RouteInfo route, MediaSessionCompat session) {"
         errorLine2="                                                 ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="110"
-            column="50"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4969,9 +4067,7 @@
         errorLine1="    public static Player create(Context context, RouteInfo route, MediaSessionCompat session) {"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="110"
-            column="67"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4980,9 +4076,7 @@
         errorLine1="    protected void updateMetadata(PlaylistItem currentItem) {"
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/Player.java"
-            line="135"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv7/media/Player.java"/>
     </issue>
 
     <issue
@@ -4991,9 +4085,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java"
-            line="47"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java"/>
     </issue>
 
     <issue
@@ -5002,9 +4094,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/RecyclerViewActivity.java"
-            line="42"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/RecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -5013,9 +4103,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/RecyclerViewActivity.java"
-            line="84"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/widget/RecyclerViewActivity.java"/>
     </issue>
 
     <issue
@@ -5024,9 +4112,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/RecyclerViewSmoothScrollByActivity.java"
-            line="44"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/RecyclerViewSmoothScrollByActivity.java"/>
     </issue>
 
     <issue
@@ -5035,9 +4121,7 @@
         errorLine1="    public RemotePlayer(Context context) {"
         errorLine2="                        ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="87"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5046,9 +4130,7 @@
         errorLine1="    public void connect(RouteInfo route) {"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="102"
-            column="25"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5057,9 +4139,7 @@
         errorLine1="    public void play(final PlaylistItem item) {"
         errorLine2="                           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="125"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5068,9 +4148,7 @@
         errorLine1="    public void seek(final PlaylistItem item) {"
         errorLine2="                           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="154"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5079,9 +4157,7 @@
         errorLine1="    public void getStatus(final PlaylistItem item, final boolean update) {"
         errorLine2="                                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="159"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5090,9 +4166,7 @@
         errorLine1="    public void enqueue(final PlaylistItem item) {"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="281"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5101,9 +4175,7 @@
         errorLine1="    public PlaylistItem remove(String itemId) {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="299"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5112,9 +4184,7 @@
         errorLine1="    public PlaylistItem remove(String itemId) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="299"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5123,9 +4193,7 @@
         errorLine1="    public Bitmap getSnapshot() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"
-            line="353"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/RemotePlayer.java"/>
     </issue>
 
     <issue
@@ -5134,9 +4202,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/RvIn2NestedScrollViewsActivity.java"
-            line="39"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/RvIn2NestedScrollViewsActivity.java"/>
     </issue>
 
     <issue
@@ -5145,9 +4211,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/RvInNestedScrollViewActivity.java"
-            line="39"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/RvInNestedScrollViewActivity.java"/>
     </issue>
 
     <issue
@@ -5156,9 +4220,7 @@
         errorLine1="    public MediaRouteProvider onCreateMediaRouteProvider() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SampleDynamicGroupMrpService.java"
-            line="30"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SampleDynamicGroupMrpService.java"/>
     </issue>
 
     <issue
@@ -5167,9 +4229,7 @@
         errorLine1="    public static void setActivity(SampleMediaRouterActivity activity) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SampleMediaButtonReceiver.java"
-            line="35"
-            column="36"/>
+            file="src/main/java/com/example/android/supportv7/media/SampleMediaButtonReceiver.java"/>
     </issue>
 
     <issue
@@ -5178,9 +4238,7 @@
         errorLine1="    public MediaRouteProvider onCreateMediaRouteProvider() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouteProviderService.java"
-            line="30"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SampleMediaRouteProviderService.java"/>
     </issue>
 
     <issue
@@ -5189,9 +4247,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/SearchActivity.java"
-            line="32"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/SearchActivity.java"/>
     </issue>
 
     <issue
@@ -5200,9 +4256,7 @@
         errorLine1="    public SessionManager(String name) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="50"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5211,9 +4265,7 @@
         errorLine1="    public String getSessionId() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="62"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5222,9 +4274,7 @@
         errorLine1="    public PlaylistItem getCurrentItem() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="66"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5233,9 +4283,7 @@
         errorLine1="    public List&lt;PlaylistItem> getPlaylist() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="71"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5244,9 +4292,7 @@
         errorLine1="    public PlaylistItem add(String title, Uri uri, String mime) {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="103"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5255,9 +4301,7 @@
         errorLine1="    public PlaylistItem add(String title, Uri uri, String mime) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="103"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5266,9 +4310,7 @@
         errorLine1="    public PlaylistItem add(String title, Uri uri, String mime) {"
         errorLine2="                                          ~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="103"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5277,9 +4319,7 @@
         errorLine1="    public PlaylistItem add(String title, Uri uri, String mime) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="103"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5288,9 +4328,7 @@
         errorLine1="    public PlaylistItem add(String title, Uri uri, String mime, long startPosition,"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="107"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5299,9 +4337,7 @@
         errorLine1="    public PlaylistItem add(String title, Uri uri, String mime, long startPosition,"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="107"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5310,9 +4346,7 @@
         errorLine1="    public PlaylistItem add(String title, Uri uri, String mime, long startPosition,"
         errorLine2="                                          ~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="107"
-            column="43"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5321,9 +4355,7 @@
         errorLine1="    public PlaylistItem add(String title, Uri uri, String mime, long startPosition,"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="107"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5332,9 +4364,7 @@
         errorLine1="            PendingIntent receiver) {"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="108"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5343,9 +4373,7 @@
         errorLine1="    public PlaylistItem remove(String iid) {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="131"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5354,9 +4382,7 @@
         errorLine1="    public PlaylistItem remove(String iid) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="131"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5365,9 +4391,7 @@
         errorLine1="    public PlaylistItem seek(String iid, long pos) {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="139"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5376,9 +4400,7 @@
         errorLine1="    public PlaylistItem seek(String iid, long pos) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="139"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5387,9 +4409,7 @@
         errorLine1="    public PlaylistItem getStatus(String iid) {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="158"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5398,9 +4418,7 @@
         errorLine1="    public PlaylistItem getStatus(String iid) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="158"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5409,9 +4427,7 @@
         errorLine1="    public String startSession() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="217"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5420,9 +4436,7 @@
         errorLine1="    public void setPlayer(Player player) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="421"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5431,9 +4445,7 @@
         errorLine1="    public void setCallback(Callback callback) {"
         errorLine2="                            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="428"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5442,9 +4454,7 @@
         errorLine1="        void onItemChanged(PlaylistItem item);"
         errorLine2="                           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"
-            line="447"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/media/SessionManager.java"/>
     </issue>
 
     <issue
@@ -5453,9 +4463,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java"
-            line="51"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -5464,9 +4472,7 @@
         errorLine1="        public String mBoundString;"
         errorLine2="               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="41"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5475,9 +4481,7 @@
         errorLine1="        public TextView mTextView;"
         errorLine2="               ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="42"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5486,9 +4490,7 @@
         errorLine1="        public ViewHolder(TextView v) {"
         errorLine2="                          ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="44"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5497,9 +4499,7 @@
         errorLine1="    public String getValueAt(int position) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="55"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5508,9 +4508,7 @@
         errorLine1="    public SimpleStringAdapter(Context context, String[] strings) {"
         errorLine2="                               ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="59"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5519,9 +4517,7 @@
         errorLine1="    public SimpleStringAdapter(Context context, String[] strings) {"
         errorLine2="                                                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="59"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5530,9 +4526,7 @@
         errorLine1="    public SimpleStringAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="79"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5541,9 +4535,7 @@
         errorLine1="    public SimpleStringAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {"
         errorLine2="                                                             ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="79"
-            column="62"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5552,9 +4544,7 @@
         errorLine1="    public void onBindViewHolder(ViewHolder holder, int position) {"
         errorLine2="                                 ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="91"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5563,9 +4553,7 @@
         errorLine1="    public RecyclerView.LayoutParams getLayoutParams() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="104"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5574,9 +4562,7 @@
         errorLine1="    public List&lt;String> getValues() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="130"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5585,9 +4571,7 @@
         errorLine1="    public void setValues(List&lt;String> values) {"
         errorLine2="                          ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"
-            line="134"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java"/>
     </issue>
 
     <issue
@@ -5596,9 +4580,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/selection/single/SingleStableIdSelectionDemoActivity.java"
-            line="46"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/widget/selection/single/SingleStableIdSelectionDemoActivity.java"/>
     </issue>
 
     <issue
@@ -5607,9 +4589,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/util/SortedListActivity.java"
-            line="45"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/util/SortedListActivity.java"/>
     </issue>
 
     <issue
@@ -5618,9 +4598,7 @@
         errorLine1="    protected LinearLayoutManager createLayoutManager() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"
-            line="63"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"/>
     </issue>
 
     <issue
@@ -5629,9 +4607,7 @@
         errorLine1="    protected RecyclerView.Adapter createAdapter() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"
-            line="68"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"/>
     </issue>
 
     <issue
@@ -5640,9 +4616,7 @@
         errorLine1="    protected void onRecyclerViewInit(RecyclerView recyclerView) {"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"
-            line="73"
-            column="39"/>
+            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"/>
     </issue>
 
     <issue
@@ -5651,9 +4625,7 @@
         errorLine1="            public ViewHolder(View itemView) {"
         errorLine2="                              ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"
-            line="87"
-            column="31"/>
+            file="src/main/java/com/example/android/supportv7/widget/StableIdActivity.java"/>
     </issue>
 
     <issue
@@ -5662,9 +4634,7 @@
         errorLine1="    protected StaggeredGridLayoutManager createLayoutManager() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"
-            line="30"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -5673,9 +4643,7 @@
         errorLine1="    protected ConfigToggle[] createConfigToggles() {"
         errorLine2="              ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"
-            line="39"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java"/>
     </issue>
 
     <issue
@@ -5684,9 +4652,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="39"
-            column="26"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5695,9 +4661,7 @@
         errorLine1="    protected List&lt;Map&lt;String, Object>> getData(String prefix) {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="56"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5706,9 +4670,7 @@
         errorLine1="    protected List&lt;Map&lt;String, Object>> getData(String prefix) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="56"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5717,9 +4679,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="124"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5728,9 +4688,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="124"
-            column="37"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5739,9 +4697,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="124"
-            column="49"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5750,9 +4706,7 @@
         errorLine1="    protected Intent browseIntent(String path) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="130"
-            column="15"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5761,9 +4715,7 @@
         errorLine1="    protected Intent browseIntent(String path) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="130"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5772,9 +4724,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="137"
-            column="28"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5783,9 +4733,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                                                           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="137"
-            column="60"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5794,9 +4742,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                                                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/Support7Demos.java"
-            line="137"
-            column="73"/>
+            file="src/main/java/com/example/android/supportv7/Support7Demos.java"/>
     </issue>
 
     <issue
@@ -5805,9 +4751,7 @@
         errorLine1="    public void onBind(ItemTouchViewHolder viewHolder) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="92"
-            column="24"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5816,9 +4760,7 @@
         errorLine1="    public void clearView(RecyclerView.ViewHolder viewHolder) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="98"
-            column="27"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5827,9 +4769,7 @@
         errorLine1="    public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="107"
-            column="35"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5838,9 +4778,7 @@
         errorLine1="    public boolean onChildDraw(Canvas c, RecyclerView recyclerView,"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="122"
-            column="32"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5849,9 +4787,7 @@
         errorLine1="    public boolean onChildDraw(Canvas c, RecyclerView recyclerView,"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="122"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5860,9 +4796,7 @@
         errorLine1="            RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="123"
-            column="13"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5871,9 +4805,7 @@
         errorLine1="    public ItemTouchViewHolder onCreateViewHolder(ViewGroup parent) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="142"
-            column="12"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5882,9 +4814,7 @@
         errorLine1="    public ItemTouchViewHolder onCreateViewHolder(ViewGroup parent) {"
         errorLine2="                                                  ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="142"
-            column="51"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5893,9 +4823,7 @@
         errorLine1="    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {"
         errorLine2="                                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="163"
-            column="33"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5904,9 +4832,7 @@
         errorLine1="    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"
-            line="163"
-            column="60"/>
+            file="src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java"/>
     </issue>
 
     <issue
@@ -5915,9 +4841,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarActionMode.java"
-            line="37"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarActionMode.java"/>
     </issue>
 
     <issue
@@ -5926,9 +4850,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarBackgroundChange.java"
-            line="40"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarBackgroundChange.java"/>
     </issue>
 
     <issue
@@ -5937,9 +4859,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarBackgroundChange.java"
-            line="84"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarBackgroundChange.java"/>
     </issue>
 
     <issue
@@ -5948,9 +4868,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarDisplayOptions.java"
-            line="42"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarDisplayOptions.java"/>
     </issue>
 
     <issue
@@ -5959,9 +4877,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="49"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -5970,9 +4886,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="92"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -5981,9 +4895,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="98"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -5992,9 +4904,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="98"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6003,9 +4913,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="105"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6014,9 +4922,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="105"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6025,9 +4931,7 @@
         errorLine1="        public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="119"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6036,9 +4940,7 @@
         errorLine1="        public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="137"
-            column="30"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6047,9 +4949,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="143"
-            column="41"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6058,9 +4958,7 @@
         errorLine1="        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="143"
-            column="52"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6069,9 +4967,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,"
         errorLine2="               ~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="148"
-            column="16"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6080,9 +4976,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="148"
-            column="34"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6091,9 +4985,7 @@
         errorLine1="        public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"
-            line="162"
-            column="46"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java"/>
     </issue>
 
     <issue
@@ -6102,9 +4994,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarTall.java"
-            line="35"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarTall.java"/>
     </issue>
 
     <issue
@@ -6113,9 +5003,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarTall.java"
-            line="53"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarTall.java"/>
     </issue>
 
     <issue
@@ -6124,9 +5012,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarUsage.java"
-            line="37"
-            column="29"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarUsage.java"/>
     </issue>
 
     <issue
@@ -6135,9 +5021,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/supportv7/app/ToolbarUsage.java"
-            line="62"
-            column="42"/>
+            file="src/main/java/com/example/android/supportv7/app/ToolbarUsage.java"/>
     </issue>
 
 </issues>
diff --git a/samples/SupportAnimationDemos/lint-baseline.xml b/samples/SupportAnimationDemos/lint-baseline.xml
index 8138560..730844a 100644
--- a/samples/SupportAnimationDemos/lint-baseline.xml
+++ b/samples/SupportAnimationDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    anim1X.getSpring().setStiffness(mStiffness).setDampingRatio(mDampingRatio);"
         errorLine2="                                                                                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="87"
-            column="81"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                    anim1X.getSpring().setStiffness(mStiffness).setDampingRatio(mDampingRatio);"
         errorLine2="                                                    ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="87"
-            column="53"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                    anim1Y.getSpring().setStiffness(mStiffness).setDampingRatio(mDampingRatio);"
         errorLine2="                                                                                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="88"
-            column="81"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    anim1Y.getSpring().setStiffness(mStiffness).setDampingRatio(mDampingRatio);"
         errorLine2="                                                    ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="88"
-            column="53"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                    anim2X.getSpring().setStiffness(mStiffness).setDampingRatio(mDampingRatio);"
         errorLine2="                                                                                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="89"
-            column="81"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                    anim2X.getSpring().setStiffness(mStiffness).setDampingRatio(mDampingRatio);"
         errorLine2="                                                    ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="89"
-            column="53"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                    anim2Y.getSpring().setStiffness(mStiffness).setDampingRatio(mDampingRatio);"
         errorLine2="                                                                                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="90"
-            column="81"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                    anim2Y.getSpring().setStiffness(mStiffness).setDampingRatio(mDampingRatio);"
         errorLine2="                                                    ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="90"
-            column="53"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                    mDampingRatio = i / 80.0f;"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="126"
-            column="21"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                    mDampingRatio = (float) Math.exp((i - 90) / 10.0);"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="128"
-            column="21"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="                    mDampingRatio = 1;"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="130"
-            column="21"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="                drTxt.setText(String.format(&quot;%.4f&quot;, (float) mDampingRatio));"
         errorLine2="                                                            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="132"
-            column="61"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                mStiffness = stiffness;"
         errorLine2="                ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="153"
-            column="17"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                mSpringView.setMassHeight(img.getY());"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="54"
-            column="17"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                    mSpringView.setMassHeight(img.getY());"
         errorLine2="                    ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="86"
-            column="21"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                    anim.getSpring().setDampingRatio(mDampingRatio).setStiffness(mStiffness);"
         errorLine2="                                                     ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="92"
-            column="54"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                    anim.getSpring().setDampingRatio(mDampingRatio).setStiffness(mStiffness);"
         errorLine2="                                                                                 ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="92"
-            column="82"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                    mDampingRatio = i / 80.0f;"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="110"
-            column="21"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                    mDampingRatio = (float) Math.exp((i - 90) / 10.0);"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="112"
-            column="21"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="                    mDampingRatio = 1;"
         errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="114"
-            column="21"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="                drTxt.setText(String.format(&quot;%.4f&quot;, (float) mDampingRatio));"
         errorLine2="                                                            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="116"
-            column="61"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="                mStiffness = stiffness;"
         errorLine2="                ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="137"
-            column="17"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="42"
-            column="26"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    protected List&lt;Map&lt;String, Object>> getData(String prefix) {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="59"
-            column="15"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    protected List&lt;Map&lt;String, Object>> getData(String prefix) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="59"
-            column="49"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="125"
-            column="15"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="125"
-            column="37"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="125"
-            column="49"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    protected Intent browseIntent(String path) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="131"
-            column="15"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    protected Intent browseIntent(String path) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="131"
-            column="35"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="138"
-            column="28"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                                                           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="138"
-            column="60"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                                                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"
-            line="138"
-            column="73"/>
+            file="src/main/java/com/example/android/support/animation/BrowseActivity.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/MainActivity.java"
-            line="38"
-            column="29"/>
+            file="src/main/java/com/example/android/support/animation/MainActivity.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringActivity.java"
-            line="40"
-            column="29"/>
+            file="src/main/java/com/example/android/support/animation/SpringActivity.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    public SpringView(Context context, AttributeSet attrs) {"
         errorLine2="                      ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringView.java"
-            line="32"
-            column="23"/>
+            file="src/main/java/com/example/android/support/animation/SpringView.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    public SpringView(Context context, AttributeSet attrs) {"
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/animation/SpringView.java"
-            line="32"
-            column="40"/>
+            file="src/main/java/com/example/android/support/animation/SpringView.java"/>
     </issue>
 
 </issues>
diff --git a/samples/SupportContentDemos/lint-baseline.xml b/samples/SupportContentDemos/lint-baseline.xml
index f966c369..7e3d03f 100644
--- a/samples/SupportContentDemos/lint-baseline.xml
+++ b/samples/SupportContentDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        mAdapter = new Adapter(mPager, PAGE_SIZE);"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="61"
-            column="20"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        mAdapter.reset(UnpagedDemoDataProvider.URI);"
         errorLine2="        ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="112"
-            column="9"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            mCurrentPage = page;"
         errorLine2="            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="170"
-            column="13"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            int offset = mCurrentPage * mPageSize;"
         errorLine2="                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="171"
-            column="26"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            return new Holder(new TextView(ContentPagerDemoActivity.this));"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="177"
-            column="20"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                    mCurrentPage,"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="189"
-            column="21"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                msg(&quot;Content query returned a null cursor: &quot; + query.getUri());"
         errorLine2="                ~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="203"
-            column="17"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            mCurrentPage = query.getOffset() / mPageSize;"
         errorLine2="            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="206"
-            column="13"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="55"
-            column="29"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"
-            line="85"
-            column="42"/>
+            file="src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection,"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="46"
-            column="12"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection,"
         errorLine2="                        ~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="46"
-            column="25"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection,"
         errorLine2="                                 ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="46"
-            column="34"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public Cursor query(Uri uri, String[] projection, String selection,"
         errorLine2="                                                      ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="46"
-            column="55"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="            String[] selectionArgs, String sortOrder) {"
         errorLine2="            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="47"
-            column="13"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="            String[] selectionArgs, String sortOrder) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="47"
-            column="37"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public int delete(Uri uri, String selection, String[] selectionArgs) {"
         errorLine2="                      ~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="62"
-            column="23"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public int delete(Uri uri, String selection, String[] selectionArgs) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="62"
-            column="32"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public int delete(Uri uri, String selection, String[] selectionArgs) {"
         errorLine2="                                                 ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="62"
-            column="50"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public String getType(Uri uri) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="67"
-            column="12"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public String getType(Uri uri) {"
         errorLine2="                          ~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="67"
-            column="27"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public Uri insert(Uri uri, ContentValues values) {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="72"
-            column="12"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public Uri insert(Uri uri, ContentValues values) {"
         errorLine2="                      ~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="72"
-            column="23"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public Uri insert(Uri uri, ContentValues values) {"
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="72"
-            column="32"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public int update(Uri uri, ContentValues values, String selection,"
         errorLine2="                      ~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="77"
-            column="23"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public int update(Uri uri, ContentValues values, String selection,"
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="77"
-            column="32"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public int update(Uri uri, ContentValues values, String selection,"
         errorLine2="                                                     ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="77"
-            column="54"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="            String[] selectionArgs) {"
         errorLine2="            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"
-            line="78"
-            column="13"/>
+            file="src/main/java/com/example/android/support/content/demos/UnpagedDemoDataProvider.java"/>
     </issue>
 
 </issues>
diff --git a/samples/SupportEmojiDemos/lint-baseline.xml b/samples/SupportEmojiDemos/lint-baseline.xml
index 598c466..32f254c 100644
--- a/samples/SupportEmojiDemos/lint-baseline.xml
+++ b/samples/SupportEmojiDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    static synchronized Config get() {"
         errorLine2="    ^">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/Config.java"
-            line="92"
-            column="5"/>
+            file="src/main/java/com/example/android/support/text/emoji/Config.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    static synchronized void load(final Context context) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/EmojiRepo.java"
-            line="40"
-            column="5"/>
+            file="src/main/java/com/example/android/support/text/emoji/EmojiRepo.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        super(context, attrs, defStyleAttr, defStyleRes);"
         errorLine2="        ~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"
-            line="60"
-            column="9"/>
+            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    read(context);"
         errorLine2="                    ~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/EmojiRepo.java"
-            line="45"
-            column="21"/>
+            file="src/main/java/com/example/android/support/text/emoji/EmojiRepo.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                holder = new ViewHolder();"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"
-            line="75"
-            column="26"/>
+            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            init();"
         errorLine2="            ~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"
-            line="75"
-            column="13"/>
+            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public ConfigLayout(Context context) {"
         errorLine2="                        ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"
-            line="41"
-            column="25"/>
+            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public ConfigLayout(Context context, AttributeSet attrs) {"
         errorLine2="                        ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"
-            line="46"
-            column="25"/>
+            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public ConfigLayout(Context context, AttributeSet attrs) {"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"
-            line="46"
-            column="42"/>
+            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public ConfigLayout(Context context, AttributeSet attrs,"
         errorLine2="                        ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"
-            line="51"
-            column="25"/>
+            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public ConfigLayout(Context context, AttributeSet attrs,"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"
-            line="51"
-            column="42"/>
+            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public ConfigLayout(Context context, AttributeSet attrs,"
         errorLine2="                        ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"
-            line="58"
-            column="25"/>
+            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public ConfigLayout(Context context, AttributeSet attrs,"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"
-            line="58"
-            column="42"/>
+            file="src/main/java/com/example/android/support/text/emoji/ConfigLayout.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public CustomTextView(Context context) {"
         errorLine2="                          ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/CustomTextView.java"
-            line="38"
-            column="27"/>
+            file="src/main/java/com/example/android/support/text/emoji/CustomTextView.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public CustomTextView(Context context, @Nullable AttributeSet attrs) {"
         errorLine2="                          ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/CustomTextView.java"
-            line="42"
-            column="27"/>
+            file="src/main/java/com/example/android/support/text/emoji/CustomTextView.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public CustomTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {"
         errorLine2="                          ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/CustomTextView.java"
-            line="46"
-            column="27"/>
+            file="src/main/java/com/example/android/support/text/emoji/CustomTextView.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"
-            line="47"
-            column="12"/>
+            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"
-            line="47"
-            column="30"/>
+            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"
-            line="47"
-            column="55"/>
+            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"
-            line="48"
-            column="13"/>
+            file="src/main/java/com/example/android/support/text/emoji/ListFragment.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/MainActivity.java"
-            line="29"
-            column="29"/>
+            file="src/main/java/com/example/android/support/text/emoji/MainActivity.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"
-            line="85"
-            column="12"/>
+            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"
-            line="85"
-            column="30"/>
+            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"
-            line="85"
-            column="55"/>
+            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="            Bundle savedInstanceState) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"
-            line="86"
-            column="13"/>
+            file="src/main/java/com/example/android/support/text/emoji/MainFragment.java"/>
     </issue>
 
 </issues>
diff --git a/samples/SupportLeanbackDemos/lint-baseline.xml b/samples/SupportLeanbackDemos/lint-baseline.xml
index 99754c9..2579349 100644
--- a/samples/SupportLeanbackDemos/lint-baseline.xml
+++ b/samples/SupportLeanbackDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/PlaybackSupportActivity.java"
-            line="43"
-            column="17"/>
+            file="src/main/java/com/example/android/leanback/PlaybackSupportActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/PlaybackTransportControlSupportActivity.java"
-            line="43"
-            column="17"/>
+            file="src/main/java/com/example/android/leanback/PlaybackTransportControlSupportActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        android:name=&quot;com.example.android.leanback.PlaybackOverlayFragment&quot;"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/layout/playback_controls.xml"
-            line="23"
-            column="23"/>
+            file="src/main/res/layout/playback_controls.xml"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        android:name=&quot;com.example.android.leanback.PlaybackOverlaySupportFragment&quot;"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/layout/playback_controls_support.xml"
-            line="25"
-            column="23"/>
+            file="src/main/res/layout/playback_controls_support.xml"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    /**"
         errorLine2="    ^">
         <location
-            file="src/main/java/com/example/android/leanback/room/PhotoDatabase.java"
-            line="35"
-            column="5"/>
+            file="src/main/java/com/example/android/leanback/room/PhotoDatabase.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="419"
-            column="25"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="419"
-            column="51"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                                                      ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="419"
-            column="71"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="            if (mPlayer.getPlaybackParams().getSpeed() != NORMAL_SPEED) {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="705"
-            column="25"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="            if (mPlayer.getPlaybackParams().getSpeed() != NORMAL_SPEED) {"
         errorLine2="                                            ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="705"
-            column="45"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="763"
-            column="17"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="763"
-            column="43"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                                              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="763"
-            column="63"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="797"
-            column="17"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="797"
-            column="43"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                                              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="797"
-            column="63"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="840"
-            column="17"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="840"
-            column="43"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                                              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="840"
-            column="63"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="932"
-            column="17"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="932"
-            column="43"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="        mPlayer.setPlaybackParams(mPlayer.getPlaybackParams().setSpeed("
         errorLine2="                                                              ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/MediaSessionService.java"
-            line="932"
-            column="63"/>
+            file="src/main/java/com/example/android/leanback/MediaSessionService.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="                        getActivity().enterPictureInPictureMode();"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/PlaybackFragment.java"
-            line="90"
-            column="39"/>
+            file="src/main/java/com/example/android/leanback/PlaybackFragment.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="                        getActivity().enterPictureInPictureMode();"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/PlaybackSupportFragment.java"
-            line="93"
-            column="39"/>
+            file="src/main/java/com/example/android/leanback/PlaybackSupportFragment.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="                        getActivity().enterPictureInPictureMode();"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/PlaybackTransportControlFragment.java"
-            line="76"
-            column="39"/>
+            file="src/main/java/com/example/android/leanback/PlaybackTransportControlFragment.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="                        getActivity().enterPictureInPictureMode();"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/leanback/PlaybackTransportControlSupportFragment.java"
-            line="79"
-            column="39"/>
+            file="src/main/java/com/example/android/leanback/PlaybackTransportControlSupportFragment.java"/>
     </issue>
 
     <issue
diff --git a/samples/SupportPreferenceDemos/lint-baseline.xml b/samples/SupportPreferenceDemos/lint-baseline.xml
index 581caf23..653f759 100644
--- a/samples/SupportPreferenceDemos/lint-baseline.xml
+++ b/samples/SupportPreferenceDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    &lt;application"
         errorLine2="     ~~~~~~~~~~~">
         <location
-            file="src/main/AndroidManifest.xml"
-            line="30"
-            column="6"/>
+            file="src/main/AndroidManifest.xml"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"
-            line="39"
-            column="29"/>
+            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"
-            line="60"
-            column="50"/>
+            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {"
         errorLine2="                                                                                  ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"
-            line="60"
-            column="83"/>
+            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        public boolean onPreferenceStartScreen(PreferenceFragmentCompat caller,"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"
-            line="76"
-            column="48"/>
+            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                PreferenceScreen pref) {"
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"
-            line="77"
-            column="17"/>
+            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"
-            line="93"
-            column="41"/>
+            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {"
         errorLine2="                                                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"
-            line="93"
-            column="68"/>
+            file="src/main/java/com/example/androidx/preference/LeanbackPreferences.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/Preferences.java"
-            line="30"
-            column="29"/>
+            file="src/main/java/com/example/androidx/preference/Preferences.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/Preferences.java"
-            line="57"
-            column="41"/>
+            file="src/main/java/com/example/androidx/preference/Preferences.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {"
         errorLine2="                                                                   ~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/preference/Preferences.java"
-            line="57"
-            column="68"/>
+            file="src/main/java/com/example/androidx/preference/Preferences.java"/>
     </issue>
 
 </issues>
diff --git a/samples/SupportRemoteCallbackDemos/lint-baseline.xml b/samples/SupportRemoteCallbackDemos/lint-baseline.xml
index 5a3d56a..2118d29 100644
--- a/samples/SupportRemoteCallbackDemos/lint-baseline.xml
+++ b/samples/SupportRemoteCallbackDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public RemoteViews createRemoteViews(Context context, int[] ids, int value) {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"
-            line="43"
-            column="12"/>
+            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public RemoteViews createRemoteViews(Context context, int[] ids, int value) {"
         errorLine2="                                         ~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"
-            line="43"
-            column="42"/>
+            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public RemoteViews createRemoteViews(Context context, int[] ids, int value) {"
         errorLine2="                                                          ~~~~~">
         <location
-            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"
-            line="43"
-            column="59"/>
+            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public RemoteCallback setValue(Context context, int[] ids, int value) {"
         errorLine2="           ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"
-            line="62"
-            column="12"/>
+            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public RemoteCallback setValue(Context context, int[] ids, int value) {"
         errorLine2="                                   ~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"
-            line="62"
-            column="36"/>
+            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public RemoteCallback setValue(Context context, int[] ids, int value) {"
         errorLine2="                                                    ~~~~~">
         <location
-            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"
-            line="62"
-            column="53"/>
+            file="src/main/java/com/example/androidx/remotecallback/demos/RemoteCallbackProvider.java"/>
     </issue>
 
 </issues>
diff --git a/samples/SupportSliceDemos/lint-baseline.xml b/samples/SupportSliceDemos/lint-baseline.xml
index 22ad8a0..722853d 100644
--- a/samples/SupportSliceDemos/lint-baseline.xml
+++ b/samples/SupportSliceDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                mSearchView.setQuery(((Cursor) mAdapter.getItem(position)).getString(1), true);"
         errorLine2="                                               ~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="127"
-            column="48"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                mSearchView.setQuery(((Cursor) mAdapter.getItem(position)).getString(1), true);"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="127"
-            column="17"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                mSearchView.setQuery(((Cursor) mAdapter.getItem(position)).getString(1), true);"
         errorLine2="                                               ~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="133"
-            column="48"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                mSearchView.setQuery(((Cursor) mAdapter.getItem(position)).getString(1), true);"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="133"
-            column="17"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                addSlice(Uri.parse(s));"
         errorLine2="                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="140"
-            column="17"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                mSearchView.clearFocus();"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="141"
-            column="17"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                populateAdapter(s);"
         errorLine2="                ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="147"
-            column="17"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        IconCache cache = new IconCache();"
         errorLine2="                          ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="84"
-            column="27"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                    if (SliceProvider.SLICE_TYPE.equals(typeCache.getType(provider))) {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="97"
-            column="57"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                        cache.loadIcon(iv, provider, pm);"
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="133"
-            column="25"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="104"
-            column="26"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public boolean onOptionsItemSelected(MenuItem item) {"
         errorLine2="                                         ~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="201"
-            column="42"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    protected void onSaveInstanceState(Bundle outState) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"
-            line="288"
-            column="40"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceBrowser.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public static void create(Context context, Consumer&lt;Uri> selectedCallback) {"
         errorLine2="                              ~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="80"
-            column="31"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public static void create(Context context, Consumer&lt;Uri> selectedCallback) {"
         errorLine2="                                               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="80"
-            column="48"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    protected static CharSequence findTitle(Context context, Slice loadedSlice,"
         errorLine2="                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="236"
-            column="22"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    protected static CharSequence findTitle(Context context, Slice loadedSlice,"
         errorLine2="                                            ~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="236"
-            column="45"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    protected static CharSequence findTitle(Context context, Slice loadedSlice,"
         errorLine2="                                                             ~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="236"
-            column="62"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="            SliceMetadata metaData) {"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="237"
-            column="13"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    protected static Slice bindSliceSynchronous(Context context, SliceViewManager manager,"
         errorLine2="                     ~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="258"
-            column="22"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    protected static Slice bindSliceSynchronous(Context context, SliceViewManager manager,"
         errorLine2="                                                ~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="258"
-            column="49"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    protected static Slice bindSliceSynchronous(Context context, SliceViewManager manager,"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="258"
-            column="66"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="            Uri slice) {"
         errorLine2="            ~~~">
         <location
-            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"
-            line="259"
-            column="13"/>
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
     </issue>
 
 </issues>
diff --git a/samples/SupportTransitionDemos/lint-baseline.xml b/samples/SupportTransitionDemos/lint-baseline.xml
index 00bbeec..6a1914f 100644
--- a/samples/SupportTransitionDemos/lint-baseline.xml
+++ b/samples/SupportTransitionDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRoot, mTransition);"
         errorLine2="                                                         ~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"
-            line="58"
-            column="58"/>
+            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRoot, mTransition);"
         errorLine2="                                                                ~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"
-            line="58"
-            column="65"/>
+            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) mTarget.getLayoutParams();"
         errorLine2="                                                                         ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"
-            line="59"
-            column="74"/>
+            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                mTarget.setLayoutParams(lp);"
         errorLine2="                ~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"
-            line="65"
-            column="17"/>
+            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                toggle();"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/BeginDelayedUsage.java"
-            line="46"
-            column="17"/>
+            file="src/main/java/com/example/android/support/transition/widget/BeginDelayedUsage.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRoot, TRANSITION);"
         errorLine2="                                                                ~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="54"
-            column="65"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRoot, TRANSITION);"
         errorLine2="                                                         ~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="54"
-            column="58"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                        mPhoto.setScaleType(ImageView.ScaleType.FIT_XY);"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="57"
-            column="25"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                        mPhoto.setScaleType(ImageView.ScaleType.CENTER);"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="60"
-            column="25"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                        mPhoto.setScaleType(ImageView.ScaleType.CENTER_CROP);"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="63"
-            column="25"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="                        mPhoto.setScaleType(ImageView.ScaleType.FIT_START);"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="66"
-            column="25"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="                        mPhoto.setScaleType(ImageView.ScaleType.FIT_END);"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="69"
-            column="25"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                        mPhoto.setScaleType(ImageView.ScaleType.MATRIX);"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="72"
-            column="25"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                        mPhoto.setImageMatrix(matrix);"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="76"
-            column="25"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRoot, mChangeTransform);"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java"
-            line="59"
-            column="65"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRoot, mChangeTransform);"
         errorLine2="                                                         ~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java"
-            line="59"
-            column="58"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRoot, mExplode);"
         errorLine2="                                                                ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"
-            line="69"
-            column="65"/>
+            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRoot, mExplode);"
         errorLine2="                                                         ~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"
-            line="69"
-            column="58"/>
+            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="                int vis = mViews.get(0).getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE;"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"
-            line="70"
-            column="27"/>
+            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="                for (View view : mViews) {"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"
-            line="71"
-            column="34"/>
+            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="            setSharedElementEnterTransition(SHARED_TRANSITION);"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="93"
-            column="45"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="            setSharedElementReturnTransition(SHARED_TRANSITION);"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="94"
-            column="46"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="            setExitTransition(NON_SHARED_TRANSITION);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="95"
-            column="31"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="            setEnterTransition(NON_SHARED_TRANSITION);"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="96"
-            column="32"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="            setReenterTransition(NON_SHARED_TRANSITION);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="97"
-            column="34"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="            setReturnTransition(NON_SHARED_TRANSITION);"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="98"
-            column="33"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="                TransitionManager.beginDelayedTransition(mRecyclerView,"
         errorLine2="                                                         ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/RecyclerViewUsage.java"
-            line="74"
-            column="58"/>
+            file="src/main/java/com/example/android/support/transition/widget/RecyclerViewUsage.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="                    addImageView(mOuterFrame, ImageView.ScaleType.CENTER_CROP, mPhotoSize);"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java"
-            line="64"
-            column="21"/>
+            file="src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="                    addImageView(mInnerFrame, ImageView.ScaleType.FIT_XY,"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java"
-            line="67"
-            column="21"/>
+            file="src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"
-            line="47"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/BeginDelayedUsage.java"
-            line="39"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/BeginDelayedUsage.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeClipBoundsUsage.java"
-            line="49"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeClipBoundsUsage.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"
-            line="47"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java"
-            line="48"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/CustomUsage.java"
-            line="37"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/CustomUsage.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"
-            line="50"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="61"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="112"
-            column="34"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="118"
-            column="35"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,"
         errorLine2="                                 ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="141"
-            column="34"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"
-            line="147"
-            column="35"/>
+            file="src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/RecyclerViewUsage.java"
-            line="46"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/RecyclerViewUsage.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java"
-            line="47"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/widget/SidePropagationUsage.java"
-            line="48"
-            column="29"/>
+            file="src/main/java/com/example/android/support/transition/widget/SidePropagationUsage.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="39"
-            column="26"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    protected List&lt;Map&lt;String, Object>> getData(String prefix) {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="56"
-            column="15"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    protected List&lt;Map&lt;String, Object>> getData(String prefix) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="56"
-            column="49"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="121"
-            column="15"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="121"
-            column="37"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    protected Intent activityIntent(String pkg, String componentName) {"
         errorLine2="                                                ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="121"
-            column="49"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    protected Intent browseIntent(String path) {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="127"
-            column="15"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    protected Intent browseIntent(String path) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="127"
-            column="35"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="134"
-            column="28"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                                                           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="134"
-            column="60"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    protected void addItem(List&lt;Map&lt;String, Object>> data, String name, Intent intent) {"
         errorLine2="                                                                        ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"
-            line="134"
-            column="73"/>
+            file="src/main/java/com/example/android/support/transition/SupportTransitionDemos.java"/>
     </issue>
 
 </issues>
diff --git a/samples/SupportWearDemos/lint-baseline.xml b/samples/SupportWearDemos/lint-baseline.xml
index 301d275..7c40746 100644
--- a/samples/SupportWearDemos/lint-baseline.xml
+++ b/samples/SupportWearDemos/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            mStateTextView.setText(&quot;Ambient&quot;);"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"
-            line="56"
-            column="13"/>
+            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            mStateTextView.setTextColor(Color.WHITE);"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"
-            line="57"
-            column="13"/>
+            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            mStateTextView.getPaint().setAntiAlias(false);"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"
-            line="58"
-            column="13"/>
+            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            mStateTextView.setText(&quot;Interactive&quot;);"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"
-            line="64"
-            column="13"/>
+            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            mStateTextView.setTextColor(Color.GREEN);"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"
-            line="65"
-            column="13"/>
+            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            mStateTextView.getPaint().setAntiAlias(true);"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"
-            line="66"
-            column="13"/>
+            file="src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                    startActivity(mData.get(mKeys[position]));"
         errorLine2="                                  ~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/MainDemoActivity.java"
-            line="114"
-            column="35"/>
+            file="src/main/java/com/example/android/support/wear/app/MainDemoActivity.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                    startActivity(mData.get(mKeys[position]));"
         errorLine2="                                            ~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/MainDemoActivity.java"
-            line="114"
-            column="45"/>
+            file="src/main/java/com/example/android/support/wear/app/MainDemoActivity.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        wrv.setAdapter(new DemoAdapter());"
         errorLine2="                       ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/SimpleWearableRecyclerViewDemo.java"
-            line="43"
-            column="24"/>
+            file="src/main/java/com/example/android/support/wear/app/SimpleWearableRecyclerViewDemo.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public void onTimerFinished(CircularProgressLayout layout) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/CircularProgressLayoutDemo.java"
-            line="58"
-            column="33"/>
+            file="src/main/java/com/example/android/support/wear/app/CircularProgressLayoutDemo.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java"
-            line="33"
-            column="29"/>
+            file="src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public DemoNavDrawerAdapter(NavItem[] navItems) {"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java"
-            line="28"
-            column="33"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public CharSequence getItemText(int pos) {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java"
-            line="33"
-            column="12"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public Drawable getItemDrawable(int pos) {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java"
-            line="38"
-            column="12"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/FrameLayoutFragment.java"
-            line="31"
-            column="12"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/FrameLayoutFragment.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/FrameLayoutFragment.java"
-            line="31"
-            column="55"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/FrameLayoutFragment.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/MainDemoActivity.java"
-            line="43"
-            column="29"/>
+            file="src/main/java/com/example/android/support/wear/app/MainDemoActivity.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public NavItem(Class&lt;? extends Fragment> fragment, String title, Drawable drawable) {"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"
-            line="28"
-            column="20"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public NavItem(Class&lt;? extends Fragment> fragment, String title, Drawable drawable) {"
         errorLine2="                                                       ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"
-            line="28"
-            column="56"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public NavItem(Class&lt;? extends Fragment> fragment, String title, Drawable drawable) {"
         errorLine2="                                                                     ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"
-            line="28"
-            column="70"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public Class&lt;? extends Fragment> getFragment() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"
-            line="34"
-            column="12"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public String getTitle() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"
-            line="38"
-            column="12"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public Drawable getDrawable() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"
-            line="42"
-            column="12"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/NavItem.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/ScrollViewFragment.java"
-            line="31"
-            column="12"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/ScrollViewFragment.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public View onCreateView(LayoutInflater inflater, ViewGroup container,"
         errorLine2="                                                      ~~~~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/ScrollViewFragment.java"
-            line="31"
-            column="55"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/ScrollViewFragment.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/SimpleWearableRecyclerViewDemo.java"
-            line="36"
-            column="29"/>
+            file="src/main/java/com/example/android/support/wear/app/SimpleWearableRecyclerViewDemo.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/drawers/WearableDrawersDemo.java"
-            line="42"
-            column="29"/>
+            file="src/main/java/com/example/android/support/wear/app/drawers/WearableDrawersDemo.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/com/example/android/support/wear/app/WearableSwitchDemo.java"
-            line="27"
-            column="29"/>
+            file="src/main/java/com/example/android/support/wear/app/WearableSwitchDemo.java"/>
     </issue>
 
 </issues>
diff --git a/security/security-crypto/lint-baseline.xml b/security/security-crypto/lint-baseline.xml
index 094910a..95f8861 100644
--- a/security/security-crypto/lint-baseline.xml
+++ b/security/security-crypto/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        @Override"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/security/crypto/EncryptedFile.java"
-            line="352"
-            column="9"/>
+            file="src/main/java/androidx/security/crypto/EncryptedFile.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        @Override"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/security/crypto/EncryptedFile.java"
-            line="357"
-            column="9"/>
+            file="src/main/java/androidx/security/crypto/EncryptedFile.java"/>
     </issue>
 
 </issues>
diff --git a/security/security-identity-credential/lint-baseline.xml b/security/security-identity-credential/lint-baseline.xml
index e00d6ab..be1c80c 100644
--- a/security/security-identity-credential/lint-baseline.xml
+++ b/security/security-identity-credential/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    builder.addErrorStatus(namespaceName, entryName, status);"
         errorLine2="                                                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/security/identity/HardwareIdentityCredential.java"
-            line="244"
-            column="70"/>
+            file="src/main/java/androidx/security/identity/HardwareIdentityCredential.java"/>
     </issue>
 
 </issues>
diff --git a/sharetarget/integration-tests/testapp/lint-baseline.xml b/sharetarget/integration-tests/testapp/lint-baseline.xml
index 84927a4..1e71b3e 100644
--- a/sharetarget/integration-tests/testapp/lint-baseline.xml
+++ b/sharetarget/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    pushDirectShareTargets();"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/testapp/MainActivity.java"
-            line="58"
-            column="21"/>
+            file="src/main/java/androidx/sharetarget/testapp/MainActivity.java"/>
     </issue>
 
     <issue
diff --git a/sharetarget/sharetarget/lint-baseline.xml b/sharetarget/sharetarget/lint-baseline.xml
index a762729..bee2da3 100644
--- a/sharetarget/sharetarget/lint-baseline.xml
+++ b/sharetarget/sharetarget/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        mShortcutSaver = mock(ShortcutInfoCompatSaverImpl.class);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ChooserTargetServiceCompatTest.java"
-            line="62"
-            column="31"/>
+            file="src/androidTest/java/androidx/sharetarget/ChooserTargetServiceCompatTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        when(mShortcutSaver.getShortcutIcon(any())).thenReturn(mTestIcon);"
         errorLine2="                            ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ChooserTargetServiceCompatTest.java"
-            line="63"
-            column="29"/>
+            file="src/androidTest/java/androidx/sharetarget/ChooserTargetServiceCompatTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        mCacheUpdateService = ShortcutInfoCompatSaverImpl.createExecutorService();"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="80"
-            column="59"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        mDiskIoService = ShortcutInfoCompatSaverImpl.createExecutorService();"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="81"
-            column="54"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        mShortcutInfoSaver = new ShortcutInfoCompatSaverImpl(mContext, mCacheUpdateService,"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="82"
-            column="30"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        catchAsyncExceptions(mShortcutInfoSaver.removeAllShortcuts());"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="84"
-            column="49"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            mShortcutInfoSaver.removeAllShortcuts().get();"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="156"
-            column="32"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                ShortcutInfoCompatSaverImpl.getInstance(mContext);"
         errorLine2="                                            ~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="239"
-            column="45"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        assertEquals(saver, ShortcutInfoCompatSaverImpl.getInstance(mContext));"
         errorLine2="                                                        ~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="241"
-            column="57"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        List&lt;ShortcutInfoCompat> shortcuts = mShortcutInfoSaver.getShortcuts();"
         errorLine2="                                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="246"
-            column="65"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        catchAsyncExceptions(mShortcutInfoSaver.addShortcuts(mTestShortcuts));"
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="254"
-            column="49"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        assertShortcutsListEquals(testShortcutsWithCategories(), mShortcutInfoSaver.getShortcuts());"
         errorLine2="                                                                                    ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="255"
-            column="85"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        ListenableFuture&lt;?> future = mShortcutInfoSaver.addShortcuts(mTestShortcuts);"
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="260"
-            column="57"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="        assertShortcutsListEquals(testShortcutsWithCategories(), mShortcutInfoSaver.getShortcuts());"
         errorLine2="                                                                                    ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="264"
-            column="85"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="        catchAsyncExceptions(mShortcutInfoSaver.addShortcuts(firstBatch));"
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="280"
-            column="49"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="        ListenableFuture&lt;Void> future = mShortcutInfoSaver.addShortcuts(secondBatch);"
         errorLine2="                                                           ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="281"
-            column="60"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        assertShortcutsListEquals(allShortcuts, mShortcutInfoSaver.getShortcuts());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="283"
-            column="68"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        assertShortcutsListEquals(allShortcuts, mShortcutInfoSaver.getShortcuts());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="286"
-            column="68"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        catchAsyncExceptions(mShortcutInfoSaver.addShortcuts(mTestShortcuts));"
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="291"
-            column="49"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="        ListenableFuture&lt;?> future = mShortcutInfoSaver.removeShortcuts(removeIds);"
         errorLine2="                                                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="296"
-            column="57"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="        assertShortcutsListEquals(testShortcutsWithCategories(), mShortcutInfoSaver.getShortcuts());"
         errorLine2="                                                                                    ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="301"
-            column="85"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="        assertShortcutsListEquals(testShortcutsWithCategories(), mShortcutInfoSaver.getShortcuts());"
         errorLine2="                                                                                    ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="304"
-            column="85"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="        catchAsyncExceptions(mShortcutInfoSaver.addShortcuts(mTestShortcuts));"
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="309"
-            column="49"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="        assertShortcutsListEquals(testShortcutsWithCategories(), mShortcutInfoSaver.getShortcuts());"
         errorLine2="                                                                                    ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="310"
-            column="85"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="        ListenableFuture&lt;?> future = mShortcutInfoSaver.removeAllShortcuts();"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="312"
-            column="57"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="        assertTrue(mShortcutInfoSaver.getShortcuts().isEmpty());"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="314"
-            column="39"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="        assertTrue(mShortcutInfoSaver.getShortcuts().isEmpty());"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="317"
-            column="39"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="        ListenableFuture&lt;?> future = mShortcutInfoSaver.addShortcuts(mTestShortcuts);"
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="322"
-            column="57"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="        List&lt;ShortcutInfoCompat> shortcuts = mShortcutInfoSaver.getShortcuts();"
         errorLine2="                                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="326"
-            column="65"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="        catchAsyncExceptions(mShortcutInfoSaver.addShortcuts(mTestShortcuts));"
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="334"
-            column="49"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="        List&lt;ShortcutInfoCompat> shortcuts = mShortcutInfoSaver.getShortcuts();"
         errorLine2="                                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="336"
-            column="65"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="            verifyCorrectIconLoaded(item.getId(), mShortcutInfoSaver.getShortcutIcon(item.getId()));"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="338"
-            column="70"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="        ListenableFuture&lt;?> future = mShortcutInfoSaver.addShortcuts(mTestShortcuts);"
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="344"
-            column="57"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="        List&lt;ShortcutInfoCompat> shortcuts = mShortcutInfoSaver.getShortcuts();"
         errorLine2="                                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="348"
-            column="65"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="            verifyCorrectIconLoaded(item.getId(), mShortcutInfoSaver.getShortcutIcon(item.getId()));"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="350"
-            column="70"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="        catchAsyncExceptions(mShortcutInfoSaver.addShortcuts(mTestShortcuts));"
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="356"
-            column="49"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="        assertNull(mShortcutInfoSaver.getShortcutIcon(&quot;unknown-id&quot;));"
         errorLine2="                                      ~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="358"
-            column="39"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="        mCacheUpdateService = ShortcutInfoCompatSaverImpl.createExecutorService();"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="400"
-            column="59"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="        mDiskIoService = ShortcutInfoCompatSaverImpl.createExecutorService();"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="401"
-            column="54"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="        mShortcutInfoSaver = new ShortcutInfoCompatSaverImpl(mContext, mCacheUpdateService,"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"
-            line="402"
-            column="30"/>
+            file="src/androidTest/java/androidx/sharetarget/ShortcutInfoCompatSaverTest.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    public static ShortcutInfoCompatSaverImpl getInstance(Context context) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="96"
-            column="19"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    public static ShortcutInfoCompatSaverImpl getInstance(Context context) {"
         errorLine2="                                                          ~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="96"
-            column="59"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    public ListenableFuture&lt;Void> removeShortcuts(List&lt;String> shortcutIds) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="153"
-            column="12"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public ListenableFuture&lt;Void> removeShortcuts(List&lt;String> shortcutIds) {"
         errorLine2="                                                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="153"
-            column="51"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public ListenableFuture&lt;Void> removeAllShortcuts() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="175"
-            column="12"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    public List&lt;ShortcutInfoCompat> getShortcuts() throws Exception {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="195"
-            column="12"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    public IconCompat getShortcutIcon(final String shortcutId) throws Exception {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="209"
-            column="12"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public IconCompat getShortcutIcon(final String shortcutId) throws Exception {"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="209"
-            column="45"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public ListenableFuture&lt;Void> addShortcuts(List&lt;ShortcutInfoCompat> shortcuts) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="267"
-            column="12"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    public ListenableFuture&lt;Void> addShortcuts(List&lt;ShortcutInfoCompat> shortcuts) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"
-            line="267"
-            column="48"/>
+            file="src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java"/>
     </issue>
 
 </issues>
diff --git a/slice/slice-builders/lint-baseline.xml b/slice/slice-builders/lint-baseline.xml
index c50749e..5ee377f 100644
--- a/slice/slice-builders/lint-baseline.xml
+++ b/slice/slice-builders/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        return mSliceAction.getImageMode();"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="451"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        setTtl(ttl == null ? INFINITY : ttl.toMillis());"
         errorLine2="                                            ~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="247"
-            column="45"/>
+            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        setTtl(ttl == null ? INFINITY : ttl.toMillis());"
         errorLine2="                                            ~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"
-            line="305"
-            column="45"/>
+            file="src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public SliceAction getPrimaryAction() {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="190"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public List&lt;CellBuilder> getCells() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="198"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public CellBuilder getSeeMoreCell() {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="206"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public PendingIntent getSeeMoreIntent() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="214"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public CharSequence getDescription() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="222"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        public List&lt;Object> getObjects() {"
         errorLine2="               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="471"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        public List&lt;Integer> getTypes() {"
         errorLine2="               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="479"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        public List&lt;Boolean> getLoadings() {"
         errorLine2="               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="487"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        public CharSequence getCellDescription() {"
         errorLine2="               ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="495"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        public PendingIntent getContentIntent() {"
         errorLine2="               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"
-            line="503"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/GridRowBuilder.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public GridRowBuilderListV1Impl(@NonNull ListBuilderImpl parent, GridRowBuilder builder) {"
         errorLine2="                                                                     ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="56"
-            column="70"/>
+            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public void addCell(CellBuilder builder) {"
         errorLine2="                        ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="89"
-            column="25"/>
+            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public void setSeeMoreAction(PendingIntent intent) {"
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="106"
-            column="34"/>
+            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public void setPrimaryAction(SliceAction action) {"
         errorLine2="                                 ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="113"
-            column="34"/>
+            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public void setContentDescription(CharSequence description) {"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="119"
-            column="39"/>
+            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="        public void fillFrom(CellBuilder builder) {"
         errorLine2="                             ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"
-            line="144"
-            column="30"/>
+            file="src/main/java/androidx/slice/builders/impl/GridRowBuilderListV1Impl.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public ListBuilderBasicImpl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="76"
-            column="33"/>
+            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public ListBuilderBasicImpl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                                                 ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"
-            line="76"
-            column="50"/>
+            file="src/main/java/androidx/slice/builders/impl/ListBuilderBasicImpl.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public MessagingBasicImpl(Slice.Builder builder, SliceSpec spec) {"
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="47"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public MessagingBasicImpl(Slice.Builder builder, SliceSpec spec) {"
         errorLine2="                                                     ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="47"
-            column="54"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public void add(TemplateBuilderImpl builder) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="72"
-            column="21"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public TemplateBuilderImpl createMessageBuilder() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="82"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="        public MessageBuilder(MessagingBasicImpl parent) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="98"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="        public void addSource(Icon source) {"
         errorLine2="                              ~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="112"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="        public void addText(CharSequence text) {"
         errorLine2="                            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"
-            line="120"
-            column="29"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBasicImpl.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    void add(TemplateBuilderImpl builder);"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBuilder.java"
-            line="35"
-            column="14"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBuilder.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    TemplateBuilderImpl createMessageBuilder();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBuilder.java"
-            line="40"
-            column="5"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBuilder.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="        void addSource(Icon source);"
         errorLine2="                       ~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBuilder.java"
-            line="50"
-            column="24"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBuilder.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="        void addText(CharSequence text);"
         errorLine2="                     ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingBuilder.java"
-            line="55"
-            column="22"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingBuilder.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    public MessagingListV1Impl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                               ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="43"
-            column="32"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public MessagingListV1Impl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="43"
-            column="49"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    public void add(TemplateBuilderImpl builder) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="52"
-            column="21"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    public TemplateBuilderImpl createMessageBuilder() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="60"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="        public MessageBuilder(MessagingListV1Impl parent) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="79"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="        public void addSource(Icon source) {"
         errorLine2="                              ~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="92"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="        public void addText(CharSequence text) {"
         errorLine2="                            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"
-            line="99"
-            column="29"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingListV1Impl.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    public MessagingSliceBuilder add(MessageBuilder builder) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="66"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    public MessagingSliceBuilder add(MessageBuilder builder) {"
         errorLine2="                                     ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="66"
-            column="38"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    public MessagingSliceBuilder add(Consumer&lt;MessageBuilder> c) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="74"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    public MessagingSliceBuilder add(Consumer&lt;MessageBuilder> c) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="74"
-            column="38"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    protected TemplateBuilderImpl selectImpl() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="90"
-            column="15"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="        public MessageBuilder(MessagingSliceBuilder parent) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="111"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="        public MessageBuilder addSource(Icon source) {"
         errorLine2="               ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="119"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="        public MessageBuilder addSource(Icon source) {"
         errorLine2="                                        ~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="119"
-            column="41"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="        public MessageBuilder addSource(IconCompat source) {"
         errorLine2="               ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="127"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="        public MessageBuilder addSource(IconCompat source) {"
         errorLine2="                                        ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="127"
-            column="41"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="        public MessageBuilder addText(CharSequence text) {"
         errorLine2="               ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="137"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="        public MessageBuilder addText(CharSequence text) {"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="137"
-            column="39"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="        public MessageBuilder addTimestamp(long timestamp) {"
         errorLine2="               ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"
-            line="145"
-            column="16"/>
+            file="src/main/java/androidx/slice/builders/MessagingSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="    public MessagingV1Impl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="39"
-            column="28"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public MessagingV1Impl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                                            ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="39"
-            column="45"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    public void add(TemplateBuilderImpl builder) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="46"
-            column="21"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public TemplateBuilderImpl createMessageBuilder() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="60"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="        public MessageBuilder(MessagingV1Impl parent) {"
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="70"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="        public void addSource(Icon source) {"
         errorLine2="                              ~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="78"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="        public void addText(CharSequence text) {"
         errorLine2="                            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"
-            line="86"
-            column="29"/>
+            file="src/main/java/androidx/slice/builders/impl/MessagingV1Impl.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="    public SelectionBuilder addOption(String optionKey, CharSequence optionText) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="74"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="    public SelectionBuilder addOption(String optionKey, CharSequence optionText) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="74"
-            column="39"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="    public SelectionBuilder addOption(String optionKey, CharSequence optionText) {"
         errorLine2="                                                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="74"
-            column="57"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="    public SelectionBuilder setPrimaryAction(@NonNull SliceAction primaryAction) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="93"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="    public SelectionBuilder setInputAction(@NonNull PendingIntent inputAction) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="107"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="    public SelectionBuilder setInputAction(@NonNull RemoteCallback inputAction) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="121"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="    public SelectionBuilder setSelectedOption(String selectedOption) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="132"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="    public SelectionBuilder setSelectedOption(String selectedOption) {"
         errorLine2="                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="132"
-            column="47"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -744,9 +610,7 @@
         errorLine1="    public SelectionBuilder setTitle(@Nullable CharSequence title) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="143"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -755,9 +619,7 @@
         errorLine1="    public SelectionBuilder setSubtitle(@Nullable CharSequence subtitle) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="154"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -766,9 +628,7 @@
         errorLine1="    public SelectionBuilder setContentDescription(@Nullable CharSequence contentDescription) {"
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="165"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -777,9 +637,7 @@
         errorLine1="    public SelectionBuilder setLayoutDirection("
         errorLine2="           ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="176"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -788,9 +646,7 @@
         errorLine1="    public List&lt;Pair&lt;String, CharSequence>> getOptions() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="186"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -799,9 +655,7 @@
         errorLine1="    public SliceAction getPrimaryAction() {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="194"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -810,9 +664,7 @@
         errorLine1="    public PendingIntent getInputAction() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="202"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -821,9 +673,7 @@
         errorLine1="    public String getSelectedOption() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="210"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -832,9 +682,7 @@
         errorLine1="    public CharSequence getTitle() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="218"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -843,9 +691,7 @@
         errorLine1="    public CharSequence getSubtitle() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="226"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -854,9 +700,7 @@
         errorLine1="    public CharSequence getContentDescription() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"
-            line="234"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/SelectionBuilder.java"/>
     </issue>
 
     <issue
@@ -865,9 +709,7 @@
         errorLine1="    public SelectionBuilderBasicImpl(Slice.Builder sliceBuilder,"
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java"
-            line="38"
-            column="38"/>
+            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java"/>
     </issue>
 
     <issue
@@ -876,9 +718,7 @@
         errorLine1="                                     SelectionBuilder selectionBuilder) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java"
-            line="39"
-            column="38"/>
+            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderBasicImpl.java"/>
     </issue>
 
     <issue
@@ -887,9 +727,7 @@
         errorLine1="    public SelectionBuilderImpl(Slice.Builder sliceBuilder,"
         errorLine2="                                ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"
-            line="35"
-            column="33"/>
+            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -898,9 +736,7 @@
         errorLine1="                                SelectionBuilder selectionBuilder) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"
-            line="36"
-            column="33"/>
+            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -909,9 +745,7 @@
         errorLine1="    protected SelectionBuilder getSelectionBuilder() {"
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"
-            line="48"
-            column="15"/>
+            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -920,9 +754,7 @@
         errorLine1="    public SelectionBuilderListV2Impl(Slice.Builder parentSliceBuilder,"
         errorLine2="                                      ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java"
-            line="46"
-            column="39"/>
+            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java"/>
     </issue>
 
     <issue
@@ -931,9 +763,7 @@
         errorLine1="                                  SelectionBuilder selectionBuilder) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java"
-            line="47"
-            column="35"/>
+            file="src/main/java/androidx/slice/builders/impl/SelectionBuilderListV2Impl.java"/>
     </issue>
 
     <issue
@@ -942,9 +772,7 @@
         errorLine1="    public static SliceAction create(@NonNull PendingIntent action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="174"
-            column="19"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -953,9 +781,7 @@
         errorLine1="    public static SliceAction create(@NonNull RemoteCallback action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="193"
-            column="19"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -964,9 +790,7 @@
         errorLine1="    public static SliceAction createDeeplink(@NonNull PendingIntent action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="243"
-            column="19"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -975,9 +799,7 @@
         errorLine1="    public static SliceAction createDeeplink(@NonNull RemoteCallback action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="265"
-            column="19"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -986,9 +808,7 @@
         errorLine1="    public static SliceAction createToggle(@NonNull PendingIntent action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="282"
-            column="19"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -997,9 +817,7 @@
         errorLine1="    public static SliceAction createToggle(@NonNull RemoteCallback action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="295"
-            column="19"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -1008,9 +826,7 @@
         errorLine1="    public static SliceAction createToggle(@NonNull PendingIntent action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="310"
-            column="19"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -1019,9 +835,7 @@
         errorLine1="    public static SliceAction createToggle(@NonNull RemoteCallback action,"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/SliceAction.java"
-            line="325"
-            column="19"/>
+            file="src/main/java/androidx/slice/builders/SliceAction.java"/>
     </issue>
 
     <issue
@@ -1030,9 +844,7 @@
         errorLine1="    protected TemplateBuilderImpl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="53"
-            column="35"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1041,9 +853,7 @@
         errorLine1="    protected TemplateBuilderImpl(Slice.Builder b, SliceSpec spec) {"
         errorLine2="                                                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="53"
-            column="52"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1052,9 +862,7 @@
         errorLine1="    protected TemplateBuilderImpl(Slice.Builder b, SliceSpec spec, Clock clock) {"
         errorLine2="                                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="57"
-            column="35"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1063,9 +871,7 @@
         errorLine1="    protected TemplateBuilderImpl(Slice.Builder b, SliceSpec spec, Clock clock) {"
         errorLine2="                                                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="57"
-            column="52"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1074,9 +880,7 @@
         errorLine1="    protected TemplateBuilderImpl(Slice.Builder b, SliceSpec spec, Clock clock) {"
         errorLine2="                                                                   ~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="57"
-            column="68"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1085,9 +889,7 @@
         errorLine1="    protected void setBuilder(Slice.Builder builder) {"
         errorLine2="                              ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="63"
-            column="31"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1096,9 +898,7 @@
         errorLine1="    public Slice build() {"
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="70"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1107,9 +907,7 @@
         errorLine1="    public Slice.Builder getBuilder() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="80"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1118,9 +916,7 @@
         errorLine1="    public Slice.Builder createChildBuilder() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="88"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1129,9 +925,7 @@
         errorLine1="    public Clock getClock() {"
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="102"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1140,9 +934,7 @@
         errorLine1="    public SliceSpec getSpec() {"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"
-            line="110"
-            column="12"/>
+            file="src/main/java/androidx/slice/builders/impl/TemplateBuilderImpl.java"/>
     </issue>
 
     <issue
@@ -1151,9 +943,7 @@
         errorLine1="    protected TemplateSliceBuilder(TemplateBuilderImpl impl) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"
-            line="57"
-            column="36"/>
+            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -1162,9 +952,7 @@
         errorLine1="    public TemplateSliceBuilder(Context context, Uri uri) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"
-            line="68"
-            column="33"/>
+            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -1173,9 +961,7 @@
         errorLine1="    public TemplateSliceBuilder(Context context, Uri uri) {"
         errorLine2="                                                 ~~~">
         <location
-            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"
-            line="68"
-            column="50"/>
+            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -1184,9 +970,7 @@
         errorLine1="    protected Slice.Builder getBuilder() {"
         errorLine2="              ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"
-            line="91"
-            column="15"/>
+            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -1195,9 +979,7 @@
         errorLine1="    protected TemplateBuilderImpl selectImpl() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"
-            line="105"
-            column="15"/>
+            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -1206,9 +988,7 @@
         errorLine1="    protected boolean checkCompatible(SliceSpec candidate) {"
         errorLine2="                                      ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"
-            line="113"
-            column="39"/>
+            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"/>
     </issue>
 
     <issue
@@ -1217,9 +997,7 @@
         errorLine1="    protected Clock getClock() {"
         errorLine2="              ~~~~~">
         <location
-            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"
-            line="135"
-            column="15"/>
+            file="src/main/java/androidx/slice/builders/TemplateSliceBuilder.java"/>
     </issue>
 
 </issues>
diff --git a/slice/slice-core/lint-baseline.xml b/slice/slice-core/lint-baseline.xml
index 8de1270..6b16971 100644
--- a/slice/slice-core/lint-baseline.xml
+++ b/slice/slice-core/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        mTestUid = mContext.getPackageManager().getPackageUid(mTestPkg, 0);"
         errorLine2="                                                ~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/slice/SlicePermissionTest.java"
-            line="58"
-            column="49"/>
+            file="src/androidTest/java/androidx/slice/SlicePermissionTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        builder.addHints(slice.getHints());"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="57"
-            column="26"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                    builder.addSubSlice(unwrap(item.getSlice()), item.getSubType());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="61"
-            column="66"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    builder.addIcon(item.getIcon().toIcon(), item.getSubType(), item.getHints());"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="64"
-            column="81"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                    builder.addIcon(item.getIcon().toIcon(), item.getSubType(), item.getHints());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="64"
-            column="62"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                    builder.addRemoteInput(item.getRemoteInput(), item.getSubType(),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="67"
-            column="67"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                            item.getHints());"
         errorLine2="                            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="68"
-            column="29"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                    builder.addAction(item.getAction(), unwrap(item.getSlice()), item.getSubType());"
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="71"
-            column="82"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                    builder.addText(item.getText(), item.getSubType(), item.getHints());"
         errorLine2="                                                                       ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="74"
-            column="72"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                    builder.addText(item.getText(), item.getSubType(), item.getHints());"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="74"
-            column="53"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="                    builder.addInt(item.getInt(), item.getSubType(), item.getHints());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="77"
-            column="70"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="                    builder.addInt(item.getInt(), item.getSubType(), item.getHints());"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="77"
-            column="51"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                    builder.addLong(item.getLong(), item.getSubType(), item.getHints());"
         errorLine2="                                                                       ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="80"
-            column="72"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                    builder.addLong(item.getLong(), item.getSubType(), item.getHints());"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="80"
-            column="53"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                    builder.addBundle((Bundle) item.mObj, item.getSubType(), item.getHints());"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="83"
-            column="78"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                    builder.addBundle((Bundle) item.mObj, item.getSubType(), item.getHints());"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceConvert.java"
-            line="83"
-            column="59"/>
+            file="src/main/java/androidx/slice/SliceConvert.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="        return mManager.checkSlicePermission(uri, pid, uid);"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/SliceManagerWrapper.java"
-            line="62"
-            column="16"/>
+            file="src/main/java/androidx/slice/SliceManagerWrapper.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    private synchronized void persist(PermissionState state) {"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/slice/compat/CompatPermissionManager.java"
-            line="107"
-            column="5"/>
+            file="src/main/java/androidx/slice/compat/CompatPermissionManager.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    /**"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/slice/compat/CompatPinnedList.java"
-            line="97"
-            column="5"/>
+            file="src/main/java/androidx/slice/compat/CompatPinnedList.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    /**"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/slice/compat/CompatPinnedList.java"
-            line="143"
-            column="5"/>
+            file="src/main/java/androidx/slice/compat/CompatPinnedList.java"/>
     </issue>
 
     <issue
diff --git a/slice/slice-test/lint-baseline.xml b/slice/slice-test/lint-baseline.xml
index 4285f01..12eb9fd 100644
--- a/slice/slice-test/lint-baseline.xml
+++ b/slice/slice-test/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public static Uri getUri(String path, Context context) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="157"
-            column="19"/>
+            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public static Uri getUri(String path, Context context) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="157"
-            column="30"/>
+            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public static Uri getUri(String path, Context context) {"
         errorLine2="                                          ~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="157"
-            column="43"/>
+            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public Slice onBindSlice(@NonNull Uri sliceUri) {"
         errorLine2="           ~~~~~">
         <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="177"
-            column="12"/>
+            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public static ArrayList&lt;String> sGroceryList = new ArrayList&lt;>();"
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"
-            line="861"
-            column="19"/>
+            file="src/main/java/androidx/slice/test/SampleSliceProvider.java"/>
     </issue>
 
 </issues>
diff --git a/slice/slice-view/lint-baseline.xml b/slice/slice-view/lint-baseline.xml
index 88e424a..3df80fe 100644
--- a/slice/slice-view/lint-baseline.xml
+++ b/slice/slice-view/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        /**"
         errorLine2="        ^">
         <location
-            file="src/main/java/androidx/slice/widget/SliceLiveData.java"
-            line="210"
-            column="9"/>
+            file="src/main/java/androidx/slice/widget/SliceLiveData.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        if (input.getRemoteInput().getAllowFreeFormInput()) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ActionRow.java"
-            line="162"
-            column="36"/>
+            file="src/main/java/androidx/slice/widget/ActionRow.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            mForeground.getBackground().setHotspot(x, y);"
         errorLine2="                                        ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/GridRowView.java"
-            line="819"
-            column="41"/>
+            file="src/main/java/androidx/slice/widget/GridRowView.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            view.performAccessibilityAction(ACTION_ACCESSIBILITY_FOCUS, null);"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/LocationBasedViewTracker.java"
-            line="51"
-            column="18"/>
+            file="src/main/java/androidx/slice/widget/LocationBasedViewTracker.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            if (child.isAccessibilityFocused()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/LocationBasedViewTracker.java"
-            line="140"
-            column="23"/>
+            file="src/main/java/androidx/slice/widget/LocationBasedViewTracker.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                return isTemporarilyDetached();"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/RemoteInputView.java"
-            line="330"
-            column="24"/>
+            file="src/main/java/androidx/slice/widget/RemoteInputView.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        super(context, attrs, defStyleAttr, defStyleRes);"
         errorLine2="        ~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/SliceView.java"
-            line="203"
-            column="9"/>
+            file="src/main/java/androidx/slice/widget/SliceView.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            mForeground.getBackground().setHotspot(x, y);"
         errorLine2="                                        ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/TemplateView.java"
-            line="126"
-            column="41"/>
+            file="src/main/java/androidx/slice/widget/TemplateView.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    &lt;plurals name=&quot;abc_slice_duration_min&quot; formatted=&quot;false&quot; msgid=&quot;7664017844210142826&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/strings.xml"
-            line="24"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/strings.xml"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    &lt;plurals name=&quot;abc_slice_duration_min&quot; formatted=&quot;false&quot; msgid=&quot;7664017844210142826&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/strings.xml"
-            line="24"
-            column="5"/>
+            file="src/main/res/values-fr/strings.xml"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    &lt;plurals name=&quot;abc_slice_duration_years&quot; formatted=&quot;false&quot; msgid=&quot;2628491538787454021&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/strings.xml"
-            line="28"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/strings.xml"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    &lt;plurals name=&quot;abc_slice_duration_years&quot; formatted=&quot;false&quot; msgid=&quot;2628491538787454021&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/strings.xml"
-            line="28"
-            column="5"/>
+            file="src/main/res/values-fr/strings.xml"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    &lt;plurals name=&quot;abc_slice_duration_days&quot; formatted=&quot;false&quot; msgid=&quot;8356547162075064530&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/strings.xml"
-            line="32"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/strings.xml"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    &lt;plurals name=&quot;abc_slice_duration_days&quot; formatted=&quot;false&quot; msgid=&quot;8356547162075064530&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/strings.xml"
-            line="32"
-            column="5"/>
+            file="src/main/res/values-fr/strings.xml"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public ActionRow(Context context, boolean fullActions) {"
         errorLine2="                     ~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ActionRow.java"
-            line="68"
-            column="22"/>
+            file="src/main/java/androidx/slice/widget/ActionRow.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public int getHeight(SliceStyle style, SliceViewPolicy policy) {"
         errorLine2="                         ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="131"
-            column="26"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public int getHeight(SliceStyle style, SliceViewPolicy policy) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="131"
-            column="44"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public DisplayedListItems getRowItems(int availableHeight, SliceStyle style,"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="144"
-            column="12"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public DisplayedListItems getRowItems(int availableHeight, SliceStyle style,"
         errorLine2="                                                               ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="144"
-            column="64"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="            SliceViewPolicy policy) {"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="145"
-            column="13"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public SliceContent getSeeMoreItem() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="180"
-            column="12"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public static int getRowType(SliceContent content, boolean isHeader,"
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="253"
-            column="34"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="                                 List&lt;SliceAction> actions) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="254"
-            column="34"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public static int getListHeight(List&lt;SliceContent> listItems, SliceStyle style,"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="293"
-            column="37"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public static int getListHeight(List&lt;SliceContent> listItems, SliceStyle style,"
         errorLine2="                                                                  ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="293"
-            column="67"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="            SliceViewPolicy policy) {"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slice/widget/ListContent.java"
-            line="294"
-            column="13"/>
+            file="src/main/java/androidx/slice/widget/ListContent.java"/>
     </issue>
 
     <issue
diff --git a/slidingpanelayout/slidingpanelayout/lint-baseline.xml b/slidingpanelayout/slidingpanelayout/lint-baseline.xml
index 3929d10..dc294c0 100644
--- a/slidingpanelayout/slidingpanelayout/lint-baseline.xml
+++ b/slidingpanelayout/slidingpanelayout/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1429"
-            column="33"/>
+            file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    protected Parcelable onSaveInstanceState() {"
         errorLine2="              ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1483"
-            column="15"/>
+            file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"/>
     </issue>
 
 </issues>
diff --git a/sqlite/integration-tests/inspection-room-testapp/lint-baseline.xml b/sqlite/integration-tests/inspection-room-testapp/lint-baseline.xml
index 5d3e5e9..302ebde 100644
--- a/sqlite/integration-tests/inspection-room-testapp/lint-baseline.xml
+++ b/sqlite/integration-tests/inspection-room-testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    fun invalidationHook() = runBlocking&lt;Unit>(testJob) {"
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/sqlite/inspection/RoomInvalidationHookTest.kt"
-            line="80"
-            column="9"/>
+            file="src/androidTest/java/androidx/sqlite/inspection/RoomInvalidationHookTest.kt"/>
     </issue>
 
 </issues>
diff --git a/sqlite/integration-tests/inspection-sqldelight-testapp/lint-baseline.xml b/sqlite/integration-tests/inspection-sqldelight-testapp/lint-baseline.xml
index e14ceefb..a0e4a60 100644
--- a/sqlite/integration-tests/inspection-sqldelight-testapp/lint-baseline.xml
+++ b/sqlite/integration-tests/inspection-sqldelight-testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    fun test() {"
         errorLine2="        ~~~~">
         <location
-            file="src/androidTest/java/androidx/sqlite/inspection/SqlDelightInvalidationTest.kt"
-            line="73"
-            column="9"/>
+            file="src/androidTest/java/androidx/sqlite/inspection/SqlDelightInvalidationTest.kt"/>
     </issue>
 
 </issues>
diff --git a/sqlite/sqlite-framework/lint-baseline.xml b/sqlite/sqlite-framework/lint-baseline.xml
index 0a7e727..5b3e294 100644
--- a/sqlite/sqlite-framework/lint-baseline.xml
+++ b/sqlite/sqlite-framework/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            db.query(&quot;SELECT * FROM sqlite_master WHERE name = &apos;Foo&apos;&quot;).use {"
         errorLine2="                                                                       ~~~">
         <location
-            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"
-            line="46"
-            column="72"/>
+            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            db.query(&quot;SELECT * FROM sqlite_master WHERE name = &apos;Foo&apos;&quot;).use {"
         errorLine2="                                                                       ~~~">
         <location
-            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"
-            line="69"
-            column="72"/>
+            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            db.query(&quot;SELECT * FROM sqlite_master WHERE name = &apos;Foo&apos;&quot;).use {"
         errorLine2="                                                                       ~~~">
         <location
-            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"
-            line="80"
-            column="72"/>
+            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            db.query(&quot;SELECT * FROM sqlite_master WHERE name = &apos;Foo&apos;&quot;).use {"
         errorLine2="                                                                       ~~~">
         <location
-            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"
-            line="176"
-            column="72"/>
+            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            db.query(&quot;SELECT * FROM sqlite_master WHERE name = &apos;Foo&apos;&quot;).use {"
         errorLine2="                                                                       ~~~">
         <location
-            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"
-            line="204"
-            column="72"/>
+            file="src/androidTest/java/androidx/sqlite/db/framework/OpenHelperRecoveryTest.kt"/>
     </issue>
 
 </issues>
diff --git a/sqlite/sqlite-inspection/lint-baseline.xml b/sqlite/sqlite-inspection/lint-baseline.xml
index e0bea32..14684a0 100644
--- a/sqlite/sqlite-inspection/lint-baseline.xml
+++ b/sqlite/sqlite-inspection/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                    mRefreshMethod.invoke(instance);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/inspection/RoomInvalidationRegistry.java"
-            line="144"
-            column="21"/>
+            file="src/main/java/androidx/sqlite/inspection/RoomInvalidationRegistry.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            mNotifyDataChangeMethod.invoke(query);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/inspection/SqlDelightInvalidation.java"
-            line="66"
-            column="13"/>
+            file="src/main/java/androidx/sqlite/inspection/SqlDelightInvalidation.java"/>
     </issue>
 
 </issues>
diff --git a/sqlite/sqlite/lint-baseline.xml b/sqlite/sqlite/lint-baseline.xml
index b956a8e..0d56396 100644
--- a/sqlite/sqlite/lint-baseline.xml
+++ b/sqlite/sqlite/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public SimpleSQLiteQuery(String query, @Nullable Object[] bindArgs) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"
-            line="36"
-            column="30"/>
+            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public SimpleSQLiteQuery(String query) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"
-            line="46"
-            column="30"/>
+            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public String getSql() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"
-            line="51"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public void bindTo(SupportSQLiteProgram statement) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"
-            line="56"
-            column="24"/>
+            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public static void bind(SupportSQLiteProgram statement, Object[] bindArgs) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"
-            line="71"
-            column="29"/>
+            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public static void bind(SupportSQLiteProgram statement, Object[] bindArgs) {"
         errorLine2="                                                            ~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"
-            line="71"
-            column="61"/>
+            file="src/main/java/androidx/sqlite/db/SimpleSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    SupportSQLiteStatement compileStatement(String sql);"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="50"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    SupportSQLiteStatement compileStatement(String sql);"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="50"
-            column="45"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    void beginTransactionWithListener(SQLiteTransactionListener transactionListener);"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="122"
-            column="39"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    void beginTransactionWithListenerNonExclusive(SQLiteTransactionListener transactionListener);"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="148"
-            column="51"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    Cursor query(String query);"
         errorLine2="    ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="311"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    Cursor query(String query);"
         errorLine2="                 ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="311"
-            column="18"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    Cursor query(String query, Object[] bindArgs);"
         errorLine2="    ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="324"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    Cursor query(String query, Object[] bindArgs);"
         errorLine2="                 ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="324"
-            column="18"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    Cursor query(String query, Object[] bindArgs);"
         errorLine2="                               ~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="324"
-            column="32"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    Cursor query(SupportSQLiteQuery query);"
         errorLine2="    ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="337"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    Cursor query(SupportSQLiteQuery query);"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="337"
-            column="18"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    Cursor query(SupportSQLiteQuery query, CancellationSignal cancellationSignal);"
         errorLine2="    ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="353"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    Cursor query(SupportSQLiteQuery query, CancellationSignal cancellationSignal);"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="353"
-            column="18"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    Cursor query(SupportSQLiteQuery query, CancellationSignal cancellationSignal);"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="353"
-            column="44"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    long insert(String table, int conflictAlgorithm, ContentValues values) throws SQLException;"
         errorLine2="                ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="369"
-            column="17"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    long insert(String table, int conflictAlgorithm, ContentValues values) throws SQLException;"
         errorLine2="                                                     ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="369"
-            column="54"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    int delete(String table, String whereClause, Object[] whereArgs);"
         errorLine2="               ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="384"
-            column="16"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    int delete(String table, String whereClause, Object[] whereArgs);"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="384"
-            column="30"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    int delete(String table, String whereClause, Object[] whereArgs);"
         errorLine2="                                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="384"
-            column="50"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    int update(String table, int conflictAlgorithm,"
         errorLine2="               ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="403"
-            column="16"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="            ContentValues values, String whereClause, Object[] whereArgs);"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="404"
-            column="13"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="            ContentValues values, String whereClause, Object[] whereArgs);"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="404"
-            column="35"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="            ContentValues values, String whereClause, Object[] whereArgs);"
         errorLine2="                                                      ~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="404"
-            column="55"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    void execSQL(String sql) throws SQLException;"
         errorLine2="                 ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="420"
-            column="18"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="    void execSQL(String sql, Object[] bindArgs) throws SQLException;"
         errorLine2="                 ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="438"
-            column="18"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    void execSQL(String sql, Object[] bindArgs) throws SQLException;"
         errorLine2="                             ~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="438"
-            column="30"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    String getPath();"
         errorLine2="    ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="467"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    void setLocale(Locale locale);"
         errorLine2="                   ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="479"
-            column="20"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    List&lt;Pair&lt;String, String>> getAttachedDbs();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"
-            line="633"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteDatabase.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    SupportSQLiteDatabase getWritableDatabase();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java"
-            line="83"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    SupportSQLiteDatabase getReadableDatabase();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java"
-            line="103"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    void bindString(int index, String value);"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteProgram.java"
-            line="60"
-            column="32"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteProgram.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    void bindBlob(int index, byte[] value);"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteProgram.java"
-            line="69"
-            column="30"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteProgram.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    String getSql();"
         errorLine2="    ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQuery.java"
-            line="30"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    void bindTo(SupportSQLiteProgram statement);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQuery.java"
-            line="37"
-            column="17"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQuery.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    public static SupportSQLiteQueryBuilder builder(String tableName) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="46"
-            column="19"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    public static SupportSQLiteQueryBuilder builder(String tableName) {"
         errorLine2="                                                    ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="46"
-            column="53"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder distinct() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="59"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder columns(String[] columns) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="71"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder columns(String[] columns) {"
         errorLine2="                                             ~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="71"
-            column="46"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder selection(String selection, Object[] bindArgs) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="84"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder selection(String selection, Object[] bindArgs) {"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="84"
-            column="48"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder selection(String selection, Object[] bindArgs) {"
         errorLine2="                                                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="84"
-            column="66"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder groupBy(String groupBy) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="98"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder groupBy(String groupBy) {"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="98"
-            column="46"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder having(String having) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="110"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder having(String having) {"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="110"
-            column="45"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder orderBy(String orderBy) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="122"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder orderBy(String orderBy) {"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="122"
-            column="46"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder limit(String limit) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="134"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="    public SupportSQLiteQueryBuilder limit(String limit) {"
         errorLine2="                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="134"
-            column="44"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="    public SupportSQLiteQuery create() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"
-            line="148"
-            column="12"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteQueryBuilder.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="    String simpleQueryForString();"
         errorLine2="    ~~~~~~">
         <location
-            file="src/main/java/androidx/sqlite/db/SupportSQLiteStatement.java"
-            line="71"
-            column="5"/>
+            file="src/main/java/androidx/sqlite/db/SupportSQLiteStatement.java"/>
     </issue>
 
 </issues>
diff --git a/swiperefreshlayout/swiperefreshlayout/lint-baseline.xml b/swiperefreshlayout/swiperefreshlayout/lint-baseline.xml
index ab184dd..1a8c9f9 100644
--- a/swiperefreshlayout/swiperefreshlayout/lint-baseline.xml
+++ b/swiperefreshlayout/swiperefreshlayout/lint-baseline.xml
@@ -7,13 +7,9 @@
         errorLine1="    public int[] getColorSchemeColors() {"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java"
-            line="381"
-            column="18"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java"/>
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java"
-            line="391"
-            column="17"
             message="Setter here"/>
     </issue>
 
@@ -23,9 +19,7 @@
         errorLine1="    public void draw(Canvas canvas) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java"
-            line="398"
-            column="22"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java"/>
     </issue>
 
     <issue
@@ -34,9 +28,7 @@
         errorLine1="    public void setColorFilter(ColorFilter colorFilter) {"
         errorLine2="                               ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java"
-            line="418"
-            column="32"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java"/>
     </issue>
 
     <issue
@@ -45,9 +37,7 @@
         errorLine1="    protected Parcelable onSaveInstanceState() {"
         errorLine2="              ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="279"
-            column="15"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -56,9 +46,7 @@
         errorLine1="    protected void onRestoreInstanceState(Parcelable state) {"
         errorLine2="                                          ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="285"
-            column="43"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -67,9 +55,7 @@
         errorLine1="    public void setColorScheme(@ColorRes int... colors) {"
         errorLine2="                                         ~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="607"
-            column="42"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -78,9 +64,7 @@
         errorLine1="    public void setColorSchemeResources(@ColorRes int... colorResIds) {"
         errorLine2="                                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="618"
-            column="51"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -89,9 +73,7 @@
         errorLine1="    public void setColorSchemeColors(@ColorInt int... colors) {"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="634"
-            column="48"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -100,9 +82,7 @@
         errorLine1="    public boolean onInterceptTouchEvent(MotionEvent ev) {"
         errorLine2="                                         ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="754"
-            column="42"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -111,9 +91,7 @@
         errorLine1="    public boolean onStartNestedScroll(View child, View target, int axes, int type) {"
         errorLine2="                                       ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="902"
-            column="40"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -122,9 +100,7 @@
         errorLine1="    public boolean onStartNestedScroll(View child, View target, int axes, int type) {"
         errorLine2="                                                   ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="902"
-            column="52"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -133,9 +109,7 @@
         errorLine1="    public void onNestedScrollAccepted(View child, View target, int axes, int type) {"
         errorLine2="                                       ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="911"
-            column="40"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -144,9 +118,7 @@
         errorLine1="    public void onNestedScrollAccepted(View child, View target, int axes, int type) {"
         errorLine2="                                                   ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="911"
-            column="52"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -155,9 +127,7 @@
         errorLine1="    public void onStopNestedScroll(View target, int type) {"
         errorLine2="                                   ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="920"
-            column="36"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -166,9 +136,7 @@
         errorLine1="    public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed,"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="929"
-            column="32"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -177,9 +145,7 @@
         errorLine1="    public void onNestedPreScroll(View target, int dx, int dy, int[] consumed, int type) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="936"
-            column="35"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -188,9 +154,7 @@
         errorLine1="    public void onNestedPreScroll(View target, int dx, int dy, int[] consumed, int type) {"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="936"
-            column="64"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -199,9 +163,7 @@
         errorLine1="    public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {"
         errorLine2="                                       ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="947"
-            column="40"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -210,9 +172,7 @@
         errorLine1="    public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {"
         errorLine2="                                                   ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="947"
-            column="52"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -221,9 +181,7 @@
         errorLine1="    public void onNestedScrollAccepted(View child, View target, int axes) {"
         errorLine2="                                       ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="953"
-            column="40"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -232,9 +190,7 @@
         errorLine1="    public void onNestedScrollAccepted(View child, View target, int axes) {"
         errorLine2="                                                   ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="953"
-            column="52"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -243,9 +199,7 @@
         errorLine1="    public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="963"
-            column="35"/>
+            file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"/>
     </issue>
 
     <issue
@@ -255,7 +209,6 @@
         errorLine2="                                                               ~~~~~">
         <location
             file="src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java"
-            line="963"
             column="64"/>
     </issue>
 
diff --git a/testutils/testutils-espresso/lint-baseline.xml b/testutils/testutils-espresso/lint-baseline.xml
index df4ac7e..b8b87a7 100644
--- a/testutils/testutils-espresso/lint-baseline.xml
+++ b/testutils/testutils-espresso/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public static SwipeToLocation swipeTo(float[] targetLocation) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="143"
-            column="19"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public static SwipeToLocation swipeTo(float[] targetLocation) {"
         errorLine2="                                          ~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="143"
-            column="43"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public static SwipeToLocation flingTo(float[] targetLocation) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="154"
-            column="19"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public static SwipeToLocation flingTo(float[] targetLocation) {"
         errorLine2="                                          ~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="154"
-            column="43"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public static SwipeToLocation swipeToCenter() {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="164"
-            column="19"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public static SwipeToLocation flingToCenter() {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="174"
-            column="19"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public Matcher&lt;View> getConstraints() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="179"
-            column="12"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public String getDescription() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="184"
-            column="12"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public void perform(UiController uiController, View view) {"
         errorLine2="                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="200"
-            column="25"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public void perform(UiController uiController, View view) {"
         errorLine2="                                                   ~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="200"
-            column="52"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void perform(Instrumentation instrumentation) {"
         errorLine2="                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/SwipeToLocation.java"
-            line="212"
-            column="25"/>
+            file="src/main/java/androidx/testutils/SwipeToLocation.java"/>
     </issue>
 
 </issues>
diff --git a/testutils/testutils-runtime/lint-baseline.xml b/testutils/testutils-runtime/lint-baseline.xml
index f82eb03..cdd32fb 100644
--- a/testutils/testutils-runtime/lint-baseline.xml
+++ b/testutils/testutils-runtime/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            durationSetter.invoke(null, 1.0f)"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/AnimationActivityTestRule.kt"
-            line="83"
-            column="13"/>
+            file="src/main/java/androidx/testutils/AnimationActivityTestRule.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    private val originalDurationScale = durationGetter.invoke(null) as Float"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"
-            line="101"
-            column="41"/>
+            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        durationSetter.invoke(null, animationDurationScale)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"
-            line="104"
-            column="9"/>
+            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        durationSetter.invoke(null, originalDurationScale)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"
-            line="108"
-            column="9"/>
+            file="src/main/java/androidx/testutils/AnimationDurationScaleRule.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                newConfig.setLocales(locales.unwrap() as LocaleList)"
         errorLine2="                          ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/LocaleTestUtils.kt"
-            line="202"
-            column="27"/>
+            file="src/main/java/androidx/testutils/LocaleTestUtils.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                newConfig.setLocale(locales.get(0))"
         errorLine2="                          ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/LocaleTestUtils.kt"
-            line="204"
-            column="27"/>
+            file="src/main/java/androidx/testutils/LocaleTestUtils.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            check(!requireActivity().isDestroyed)"
         errorLine2="                                     ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/fragment/app/StrictFragment.kt"
-            line="57"
-            column="38"/>
+            file="src/main/java/androidx/fragment/app/StrictFragment.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="            final @NonNull Lifecycle.State state) throws Throwable {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/testutils/LifecycleOwnerUtils.java"
-            line="53"
-            column="13"/>
+            file="src/main/java/androidx/testutils/LifecycleOwnerUtils.java"/>
     </issue>
 
 </issues>
diff --git a/transition/transition/lint-baseline.xml b/transition/transition/lint-baseline.xml
index d754241..72dfc05 100644
--- a/transition/transition/lint-baseline.xml
+++ b/transition/transition/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    static final int[] TRANSITION_TARGET = {"
         errorLine2="                                           ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="30"
-            column="44"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        int TARGET_ID = 1;"
         errorLine2="                        ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="43"
-            column="25"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        int EXCLUDE_ID = 2;"
         errorLine2="                         ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="45"
-            column="26"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        int EXCLUDE_CLASS = 3;"
         errorLine2="                            ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="47"
-            column="29"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        int TARGET_NAME = 4;"
         errorLine2="                          ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="49"
-            column="27"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        int EXCLUDE_NAME = 5;"
         errorLine2="                           ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="51"
-            column="28"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    static final int[] TRANSITION_MANAGER = {"
         errorLine2="                                            ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="55"
-            column="45"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        int TO_SCENE = 1;"
         errorLine2="                       ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="65"
-            column="24"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        int TRANSITION = 2;"
         errorLine2="                         ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="67"
-            column="26"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    static final int[] TRANSITION = {"
         errorLine2="                                    ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="71"
-            column="37"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        int DURATION = 1;"
         errorLine2="                       ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="82"
-            column="24"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        int START_DELAY = 2;"
         errorLine2="                          ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="84"
-            column="27"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="        int MATCH_ORDER = 3;"
         errorLine2="                          ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="86"
-            column="27"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    static final int[] CHANGE_BOUNDS = {"
         errorLine2="                                       ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="90"
-            column="40"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    static final int[] VISIBILITY_TRANSITION = {"
         errorLine2="                                               ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="100"
-            column="48"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    static final int[] FADE = {"
         errorLine2="                              ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="110"
-            column="31"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    static final int[] CHANGE_TRANSFORM = {"
         errorLine2="                                          ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="120"
-            column="43"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="        int REPARENT_WITH_OVERLAY = 1;"
         errorLine2="                                    ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="129"
-            column="37"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    static final int[] SLIDE = {"
         errorLine2="                               ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="133"
-            column="32"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    static final int[] TRANSITION_SET = {"
         errorLine2="                                        ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="143"
-            column="41"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    static final int[] ARC_MOTION = {"
         errorLine2="                                    ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="153"
-            column="37"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="        int MINIMUM_VERTICAL_ANGLE = 1;"
         errorLine2="                                     ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="163"
-            column="38"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="        int MAXIMUM_ANGLE = 2;"
         errorLine2="                            ~">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="165"
-            column="29"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    static final int[] PATTERN_PATH_MOTION = {"
         errorLine2="                                             ^">
         <location
-            file="src/main/java/androidx/transition/Styleable.java"
-            line="169"
-            column="46"/>
+            file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="                        (View) sAddGhostMethod.invoke(null, view, viewGroup, matrix));"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/GhostViewPlatform.java"
-            line="47"
-            column="32"/>
+            file="src/main/java/androidx/transition/GhostViewPlatform.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="                sRemoveGhostMethod.invoke(null, view);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/GhostViewPlatform.java"
-            line="61"
-            column="17"/>
+            file="src/main/java/androidx/transition/GhostViewPlatform.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="                sCancelMethod.invoke(t);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewGroupUtilsApi14.java"
-            line="125"
-            column="17"/>
+            file="src/main/java/androidx/transition/ViewGroupUtilsApi14.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="                    sInvalidateChildInParentFastMethod.invoke(mHostView, left, top, dirty);"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewOverlayApi14.java"
-            line="290"
-            column="21"/>
+            file="src/main/java/androidx/transition/ViewOverlayApi14.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="                sSetFrameMethod.invoke(v, left, top, right, bottom);"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewUtilsBase.java"
-            line="145"
-            column="17"/>
+            file="src/main/java/androidx/transition/ViewUtilsBase.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="            animator.addPauseListener(listener);"
         errorLine2="                     ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/AnimatorUtils.java"
-            line="32"
-            column="22"/>
+            file="src/main/java/androidx/transition/AnimatorUtils.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="            animator.pause();"
         errorLine2="                     ~~~~~">
         <location
-            file="src/main/java/androidx/transition/AnimatorUtils.java"
-            line="38"
-            column="22"/>
+            file="src/main/java/androidx/transition/AnimatorUtils.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="            animator.resume();"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/AnimatorUtils.java"
-            line="54"
-            column="22"/>
+            file="src/main/java/androidx/transition/AnimatorUtils.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="                canvas.enableZ();"
         errorLine2="                       ~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/CanvasUtils.java"
-            line="45"
-            column="24"/>
+            file="src/main/java/androidx/transition/CanvasUtils.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="                canvas.disableZ();"
         errorLine2="                       ~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/CanvasUtils.java"
-            line="47"
-            column="24"/>
+            file="src/main/java/androidx/transition/CanvasUtils.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="            if (view.getZ() != comparedWith.getZ()) {"
         errorLine2="                     ~~~~">
         <location
-            file="src/main/java/androidx/transition/GhostViewHolder.java"
-            line="176"
-            column="22"/>
+            file="src/main/java/androidx/transition/GhostViewHolder.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="            if (view.getZ() != comparedWith.getZ()) {"
         errorLine2="                                            ~~~~">
         <location
-            file="src/main/java/androidx/transition/GhostViewHolder.java"
-            line="176"
-            column="45"/>
+            file="src/main/java/androidx/transition/GhostViewHolder.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="                return view.getZ() > comparedWith.getZ();"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/transition/GhostViewHolder.java"
-            line="177"
-            column="29"/>
+            file="src/main/java/androidx/transition/GhostViewHolder.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="                return view.getZ() > comparedWith.getZ();"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/androidx/transition/GhostViewHolder.java"
-            line="177"
-            column="51"/>
+            file="src/main/java/androidx/transition/GhostViewHolder.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="            view.animateTransform(matrix);"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ImageViewUtils.java"
-            line="46"
-            column="18"/>
+            file="src/main/java/androidx/transition/ImageViewUtils.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="                view.animateTransform(matrix);"
         errorLine2="                     ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ImageViewUtils.java"
-            line="92"
-            column="22"/>
+            file="src/main/java/androidx/transition/ImageViewUtils.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="            return ObjectAnimator.ofObject(target, property, null, path);"
         errorLine2="                                  ~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ObjectAnimatorUtils.java"
-            line="29"
-            column="35"/>
+            file="src/main/java/androidx/transition/ObjectAnimatorUtils.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="            return PropertyValuesHolder.ofObject(property, null, path);"
         errorLine2="                                        ~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/PropertyValuesHolderUtils.java"
-            line="39"
-            column="41"/>
+            file="src/main/java/androidx/transition/PropertyValuesHolderUtils.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="            addToOverlay = !view.isAttachedToWindow();"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionUtils.java"
-            line="94"
-            column="34"/>
+            file="src/main/java/androidx/transition/TransitionUtils.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="            sceneRootIsAttached = sceneRoot == null ? false : sceneRoot.isAttachedToWindow();"
         errorLine2="                                                                        ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionUtils.java"
-            line="95"
-            column="73"/>
+            file="src/main/java/androidx/transition/TransitionUtils.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="            sceneRoot.getOverlay().add(view);"
         errorLine2="                      ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionUtils.java"
-            line="108"
-            column="23"/>
+            file="src/main/java/androidx/transition/TransitionUtils.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="            sceneRoot.getOverlay().add(view);"
         errorLine2="                                   ~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionUtils.java"
-            line="108"
-            column="36"/>
+            file="src/main/java/androidx/transition/TransitionUtils.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="                bitmap = Bitmap.createBitmap(picture);"
         errorLine2="                                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionUtils.java"
-            line="127"
-            column="33"/>
+            file="src/main/java/androidx/transition/TransitionUtils.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="            sceneRoot.getOverlay().remove(view);"
         errorLine2="                      ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionUtils.java"
-            line="137"
-            column="23"/>
+            file="src/main/java/androidx/transition/TransitionUtils.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="            sceneRoot.getOverlay().remove(view);"
         errorLine2="                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionUtils.java"
-            line="137"
-            column="36"/>
+            file="src/main/java/androidx/transition/TransitionUtils.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="            group.suppressLayout(suppress);"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewGroupUtils.java"
-            line="57"
-            column="19"/>
+            file="src/main/java/androidx/transition/ViewGroupUtils.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="                group.suppressLayout(suppress);"
         errorLine2="                      ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewGroupUtils.java"
-            line="72"
-            column="23"/>
+            file="src/main/java/androidx/transition/ViewGroupUtils.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="            return viewGroup.getChildDrawingOrder(i);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewGroupUtils.java"
-            line="84"
-            column="30"/>
+            file="src/main/java/androidx/transition/ViewGroupUtils.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="                view.setTransitionAlpha(alpha);"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewUtilsApi19.java"
-            line="40"
-            column="22"/>
+            file="src/main/java/androidx/transition/ViewUtilsApi19.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="                return view.getTransitionAlpha();"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewUtilsApi19.java"
-            line="56"
-            column="29"/>
+            file="src/main/java/androidx/transition/ViewUtilsApi19.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="                view.transformMatrixToGlobal(matrix);"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewUtilsApi21.java"
-            line="50"
-            column="22"/>
+            file="src/main/java/androidx/transition/ViewUtilsApi21.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="                view.transformMatrixToLocal(matrix);"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewUtilsApi21.java"
-            line="64"
-            column="22"/>
+            file="src/main/java/androidx/transition/ViewUtilsApi21.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="                view.setAnimationMatrix(matrix);"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewUtilsApi21.java"
-            line="78"
-            column="22"/>
+            file="src/main/java/androidx/transition/ViewUtilsApi21.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="                v.setLeftTopRightBottom(left, top, right, bottom);"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewUtilsApi22.java"
-            line="40"
-            column="19"/>
+            file="src/main/java/androidx/transition/ViewUtilsApi22.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="                    view.setTransitionVisibility(visibility);"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/ViewUtilsApi23.java"
-            line="45"
-            column="26"/>
+            file="src/main/java/androidx/transition/ViewUtilsApi23.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="    public long getStartDelay(ViewGroup sceneRoot, Transition transition,"
         errorLine2="                              ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/CircularPropagation.java"
-            line="57"
-            column="31"/>
+            file="src/main/java/androidx/transition/CircularPropagation.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="    public long getStartDelay(ViewGroup sceneRoot, Transition transition,"
         errorLine2="                                                   ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/CircularPropagation.java"
-            line="57"
-            column="52"/>
+            file="src/main/java/androidx/transition/CircularPropagation.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/CircularPropagation.java"
-            line="58"
-            column="13"/>
+            file="src/main/java/androidx/transition/CircularPropagation.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/CircularPropagation.java"
-            line="58"
-            column="43"/>
+            file="src/main/java/androidx/transition/CircularPropagation.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view,"
         errorLine2="                             ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Explode.java"
-            line="84"
-            column="30"/>
+            file="src/main/java/androidx/transition/Explode.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view,"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/androidx/transition/Explode.java"
-            line="84"
-            column="51"/>
+            file="src/main/java/androidx/transition/Explode.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Explode.java"
-            line="85"
-            column="13"/>
+            file="src/main/java/androidx/transition/Explode.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Explode.java"
-            line="85"
-            column="43"/>
+            file="src/main/java/androidx/transition/Explode.java"/>
     </issue>
 
     <issue
@@ -744,9 +610,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, View view,"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Explode.java"
-            line="102"
-            column="33"/>
+            file="src/main/java/androidx/transition/Explode.java"/>
     </issue>
 
     <issue
@@ -755,9 +619,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, View view,"
         errorLine2="                                                     ~~~~">
         <location
-            file="src/main/java/androidx/transition/Explode.java"
-            line="102"
-            column="54"/>
+            file="src/main/java/androidx/transition/Explode.java"/>
     </issue>
 
     <issue
@@ -766,9 +628,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Explode.java"
-            line="103"
-            column="13"/>
+            file="src/main/java/androidx/transition/Explode.java"/>
     </issue>
 
     <issue
@@ -777,9 +637,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Explode.java"
-            line="103"
-            column="43"/>
+            file="src/main/java/androidx/transition/Explode.java"/>
     </issue>
 
     <issue
@@ -788,9 +646,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view,"
         errorLine2="                             ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Fade.java"
-            line="149"
-            column="30"/>
+            file="src/main/java/androidx/transition/Fade.java"/>
     </issue>
 
     <issue
@@ -799,9 +655,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view,"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/androidx/transition/Fade.java"
-            line="149"
-            column="51"/>
+            file="src/main/java/androidx/transition/Fade.java"/>
     </issue>
 
     <issue
@@ -810,9 +664,7 @@
         errorLine1="            TransitionValues startValues,"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Fade.java"
-            line="150"
-            column="13"/>
+            file="src/main/java/androidx/transition/Fade.java"/>
     </issue>
 
     <issue
@@ -821,9 +673,7 @@
         errorLine1="            TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Fade.java"
-            line="151"
-            column="13"/>
+            file="src/main/java/androidx/transition/Fade.java"/>
     </issue>
 
     <issue
@@ -832,9 +682,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, final View view, TransitionValues startValues,"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Fade.java"
-            line="166"
-            column="33"/>
+            file="src/main/java/androidx/transition/Fade.java"/>
     </issue>
 
     <issue
@@ -843,9 +691,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, final View view, TransitionValues startValues,"
         errorLine2="                                                           ~~~~">
         <location
-            file="src/main/java/androidx/transition/Fade.java"
-            line="166"
-            column="60"/>
+            file="src/main/java/androidx/transition/Fade.java"/>
     </issue>
 
     <issue
@@ -854,9 +700,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, final View view, TransitionValues startValues,"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Fade.java"
-            line="166"
-            column="71"/>
+            file="src/main/java/androidx/transition/Fade.java"/>
     </issue>
 
     <issue
@@ -865,9 +709,7 @@
         errorLine1="            TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Fade.java"
-            line="167"
-            column="13"/>
+            file="src/main/java/androidx/transition/Fade.java"/>
     </issue>
 
     <issue
@@ -876,9 +718,7 @@
         errorLine1="    public boolean canHandle(Object transition) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="47"
-            column="30"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -887,9 +727,7 @@
         errorLine1="    public Object cloneTransition(Object transition) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="52"
-            column="12"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -898,9 +736,7 @@
         errorLine1="    public Object cloneTransition(Object transition) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="52"
-            column="35"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -909,9 +745,7 @@
         errorLine1="    public Object wrapTransitionInSet(Object transition) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="61"
-            column="12"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -920,9 +754,7 @@
         errorLine1="    public Object wrapTransitionInSet(Object transition) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="61"
-            column="39"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -931,9 +763,7 @@
         errorLine1="    public void setSharedElementTargets(Object transitionObj,"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="71"
-            column="41"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -942,9 +772,7 @@
         errorLine1="            View nonExistentView, ArrayList&lt;View> sharedViews) {"
         errorLine2="            ~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="72"
-            column="13"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -953,9 +781,7 @@
         errorLine1="            View nonExistentView, ArrayList&lt;View> sharedViews) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="72"
-            column="35"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -964,9 +790,7 @@
         errorLine1="    public void setEpicenter(Object transitionObj, View view) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="87"
-            column="30"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -975,9 +799,7 @@
         errorLine1="    public void setEpicenter(Object transitionObj, View view) {"
         errorLine2="                                                   ~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="87"
-            column="52"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -986,9 +808,7 @@
         errorLine1="    public void addTargets(Object transitionObj, ArrayList&lt;View> views) {"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="103"
-            column="28"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -997,9 +817,7 @@
         errorLine1="    public void addTargets(Object transitionObj, ArrayList&lt;View> views) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="103"
-            column="50"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1008,9 +826,7 @@
         errorLine1="    public Object mergeTransitionsTogether(Object transition1, Object transition2,"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="134"
-            column="12"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1019,9 +835,7 @@
         errorLine1="    public Object mergeTransitionsTogether(Object transition1, Object transition2,"
         errorLine2="                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="134"
-            column="44"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1030,9 +844,7 @@
         errorLine1="    public Object mergeTransitionsTogether(Object transition1, Object transition2,"
         errorLine2="                                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="134"
-            column="64"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1041,9 +853,7 @@
         errorLine1="            Object transition3) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="135"
-            column="13"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1052,9 +862,7 @@
         errorLine1="    public void scheduleHideFragmentView(Object exitTransitionObj, final View fragmentView,"
         errorLine2="                                         ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="150"
-            column="42"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1063,9 +871,7 @@
         errorLine1="    public void scheduleHideFragmentView(Object exitTransitionObj, final View fragmentView,"
         errorLine2="                                                                         ~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="150"
-            column="74"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1074,9 +880,7 @@
         errorLine1="            final ArrayList&lt;View> exitingViews) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="151"
-            column="19"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1085,9 +889,7 @@
         errorLine1="    public Object mergeTransitionsInSequence(Object exitTransitionObj,"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="191"
-            column="12"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1096,9 +898,7 @@
         errorLine1="    public Object mergeTransitionsInSequence(Object exitTransitionObj,"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="191"
-            column="46"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1107,9 +907,7 @@
         errorLine1="            Object enterTransitionObj, Object sharedElementTransitionObj) {"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="192"
-            column="13"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1118,9 +916,7 @@
         errorLine1="            Object enterTransitionObj, Object sharedElementTransitionObj) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="192"
-            column="40"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1129,9 +925,7 @@
         errorLine1="    public void beginDelayedTransition(ViewGroup sceneRoot, Object transition) {"
         errorLine2="                                       ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="222"
-            column="40"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1140,9 +934,7 @@
         errorLine1="    public void beginDelayedTransition(ViewGroup sceneRoot, Object transition) {"
         errorLine2="                                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="222"
-            column="61"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1151,9 +943,7 @@
         errorLine1="    public void scheduleRemoveTargets(final Object overallTransitionObj,"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="227"
-            column="45"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1162,9 +952,7 @@
         errorLine1="            final Object enterTransition, final ArrayList&lt;View> enteringViews,"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="228"
-            column="19"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1173,9 +961,7 @@
         errorLine1="            final Object enterTransition, final ArrayList&lt;View> enteringViews,"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="228"
-            column="49"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1184,9 +970,7 @@
         errorLine1="            final Object exitTransition, final ArrayList&lt;View> exitingViews,"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="229"
-            column="19"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1195,9 +979,7 @@
         errorLine1="            final Object exitTransition, final ArrayList&lt;View> exitingViews,"
         errorLine2="                                               ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="229"
-            column="48"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1206,9 +988,7 @@
         errorLine1="            final Object sharedElementTransition, final ArrayList&lt;View> sharedElementsIn) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="230"
-            column="19"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1217,9 +997,7 @@
         errorLine1="            final Object sharedElementTransition, final ArrayList&lt;View> sharedElementsIn) {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="230"
-            column="57"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1228,9 +1006,7 @@
         errorLine1="    public void swapSharedElementTargets(Object sharedElementTransitionObj,"
         errorLine2="                                         ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="295"
-            column="42"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1239,9 +1015,7 @@
         errorLine1="            ArrayList&lt;View> sharedElementsOut, ArrayList&lt;View> sharedElementsIn) {"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="296"
-            column="13"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1250,9 +1024,7 @@
         errorLine1="            ArrayList&lt;View> sharedElementsOut, ArrayList&lt;View> sharedElementsIn) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="296"
-            column="48"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1261,9 +1033,7 @@
         errorLine1="    public void replaceTargets(Object transitionObj, ArrayList&lt;View> oldTargets,"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="306"
-            column="32"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1272,9 +1042,7 @@
         errorLine1="    public void replaceTargets(Object transitionObj, ArrayList&lt;View> oldTargets,"
         errorLine2="                                                     ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="306"
-            column="54"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1283,9 +1051,7 @@
         errorLine1="            ArrayList&lt;View> newTargets) {"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="307"
-            column="13"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1294,9 +1060,7 @@
         errorLine1="    public void addTarget(Object transitionObj, View view) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="333"
-            column="27"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1305,9 +1069,7 @@
         errorLine1="    public void addTarget(Object transitionObj, View view) {"
         errorLine2="                                                ~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="333"
-            column="49"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1316,9 +1078,7 @@
         errorLine1="    public void removeTarget(Object transitionObj, View view) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="341"
-            column="30"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1327,9 +1087,7 @@
         errorLine1="    public void removeTarget(Object transitionObj, View view) {"
         errorLine2="                                                   ~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="341"
-            column="52"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1338,9 +1096,7 @@
         errorLine1="    public void setEpicenter(Object transitionObj, final Rect epicenter) {"
         errorLine2="                             ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="349"
-            column="30"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1349,9 +1105,7 @@
         errorLine1="    public void setEpicenter(Object transitionObj, final Rect epicenter) {"
         errorLine2="                                                         ~~~~">
         <location
-            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"
-            line="349"
-            column="58"/>
+            file="src/main/java/androidx/transition/FragmentTransitionSupport.java"/>
     </issue>
 
     <issue
@@ -1360,9 +1114,7 @@
         errorLine1="    public PatternPathMotion(Path patternPath) {"
         errorLine2="                             ~~~~">
         <location
-            file="src/main/java/androidx/transition/PatternPathMotion.java"
-            line="85"
-            column="30"/>
+            file="src/main/java/androidx/transition/PatternPathMotion.java"/>
     </issue>
 
     <issue
@@ -1371,9 +1123,7 @@
         errorLine1="    public Path getPatternPath() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/transition/PatternPathMotion.java"
-            line="96"
-            column="12"/>
+            file="src/main/java/androidx/transition/PatternPathMotion.java"/>
     </issue>
 
     <issue
@@ -1382,9 +1132,7 @@
         errorLine1="    public void setPatternPath(Path patternPath) {"
         errorLine2="                               ~~~~">
         <location
-            file="src/main/java/androidx/transition/PatternPathMotion.java"
-            line="107"
-            column="32"/>
+            file="src/main/java/androidx/transition/PatternPathMotion.java"/>
     </issue>
 
     <issue
@@ -1393,9 +1141,7 @@
         errorLine1="    public long getStartDelay(ViewGroup sceneRoot, Transition transition,"
         errorLine2="                              ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/SidePropagation.java"
-            line="74"
-            column="31"/>
+            file="src/main/java/androidx/transition/SidePropagation.java"/>
     </issue>
 
     <issue
@@ -1404,9 +1150,7 @@
         errorLine1="    public long getStartDelay(ViewGroup sceneRoot, Transition transition,"
         errorLine2="                                                   ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/SidePropagation.java"
-            line="74"
-            column="52"/>
+            file="src/main/java/androidx/transition/SidePropagation.java"/>
     </issue>
 
     <issue
@@ -1415,9 +1159,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/SidePropagation.java"
-            line="75"
-            column="13"/>
+            file="src/main/java/androidx/transition/SidePropagation.java"/>
     </issue>
 
     <issue
@@ -1426,9 +1168,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/SidePropagation.java"
-            line="75"
-            column="43"/>
+            file="src/main/java/androidx/transition/SidePropagation.java"/>
     </issue>
 
     <issue
@@ -1437,9 +1177,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view,"
         errorLine2="                             ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Slide.java"
-            line="250"
-            column="30"/>
+            file="src/main/java/androidx/transition/Slide.java"/>
     </issue>
 
     <issue
@@ -1448,9 +1186,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view,"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/androidx/transition/Slide.java"
-            line="250"
-            column="51"/>
+            file="src/main/java/androidx/transition/Slide.java"/>
     </issue>
 
     <issue
@@ -1459,9 +1195,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Slide.java"
-            line="251"
-            column="13"/>
+            file="src/main/java/androidx/transition/Slide.java"/>
     </issue>
 
     <issue
@@ -1470,9 +1204,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Slide.java"
-            line="251"
-            column="43"/>
+            file="src/main/java/androidx/transition/Slide.java"/>
     </issue>
 
     <issue
@@ -1481,9 +1213,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, View view,"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Slide.java"
-            line="267"
-            column="33"/>
+            file="src/main/java/androidx/transition/Slide.java"/>
     </issue>
 
     <issue
@@ -1492,9 +1222,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, View view,"
         errorLine2="                                                     ~~~~">
         <location
-            file="src/main/java/androidx/transition/Slide.java"
-            line="267"
-            column="54"/>
+            file="src/main/java/androidx/transition/Slide.java"/>
     </issue>
 
     <issue
@@ -1503,9 +1231,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Slide.java"
-            line="268"
-            column="13"/>
+            file="src/main/java/androidx/transition/Slide.java"/>
     </issue>
 
     <issue
@@ -1514,9 +1240,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Slide.java"
-            line="268"
-            column="43"/>
+            file="src/main/java/androidx/transition/Slide.java"/>
     </issue>
 
     <issue
@@ -1525,9 +1249,7 @@
         errorLine1="    public void setMatchOrder(@MatchOrder int... matches) {"
         errorLine2="                                          ~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Transition.java"
-            line="506"
-            column="43"/>
+            file="src/main/java/androidx/transition/Transition.java"/>
     </issue>
 
     <issue
@@ -1536,9 +1258,7 @@
         errorLine1="    public void pause(View sceneRoot) {"
         errorLine2="                      ~~~~">
         <location
-            file="src/main/java/androidx/transition/Transition.java"
-            line="1712"
-            column="23"/>
+            file="src/main/java/androidx/transition/Transition.java"/>
     </issue>
 
     <issue
@@ -1547,9 +1267,7 @@
         errorLine1="    public void resume(View sceneRoot) {"
         errorLine2="                       ~~~~">
         <location
-            file="src/main/java/androidx/transition/Transition.java"
-            line="1739"
-            column="24"/>
+            file="src/main/java/androidx/transition/Transition.java"/>
     </issue>
 
     <issue
@@ -1558,9 +1276,7 @@
         errorLine1="    protected void animate(Animator animator) {"
         errorLine2="                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Transition.java"
-            line="1881"
-            column="28"/>
+            file="src/main/java/androidx/transition/Transition.java"/>
     </issue>
 
     <issue
@@ -1569,9 +1285,7 @@
         errorLine1="    public Transition clone() {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Transition.java"
-            line="2201"
-            column="12"/>
+            file="src/main/java/androidx/transition/Transition.java"/>
     </issue>
 
     <issue
@@ -1580,9 +1294,7 @@
         errorLine1="        public abstract Rect onGetEpicenter(@NonNull Transition transition);"
         errorLine2="                        ~~~~">
         <location
-            file="src/main/java/androidx/transition/Transition.java"
-            line="2424"
-            column="25"/>
+            file="src/main/java/androidx/transition/Transition.java"/>
     </issue>
 
     <issue
@@ -1591,9 +1303,7 @@
         errorLine1="    public Transition inflateTransition(int resource) {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionInflater.java"
-            line="70"
-            column="12"/>
+            file="src/main/java/androidx/transition/TransitionInflater.java"/>
     </issue>
 
     <issue
@@ -1602,9 +1312,7 @@
         errorLine1="    public TransitionManager inflateTransitionManager(int resource, ViewGroup sceneRoot) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionInflater.java"
-            line="92"
-            column="12"/>
+            file="src/main/java/androidx/transition/TransitionInflater.java"/>
     </issue>
 
     <issue
@@ -1613,9 +1321,7 @@
         errorLine1="    public TransitionManager inflateTransitionManager(int resource, ViewGroup sceneRoot) {"
         errorLine2="                                                                    ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionInflater.java"
-            line="92"
-            column="69"/>
+            file="src/main/java/androidx/transition/TransitionInflater.java"/>
     </issue>
 
     <issue
@@ -1624,9 +1330,7 @@
         errorLine1="    public static void endTransitions(final ViewGroup sceneRoot) {"
         errorLine2="                                            ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionManager.java"
-            line="428"
-            column="45"/>
+            file="src/main/java/androidx/transition/TransitionManager.java"/>
     </issue>
 
     <issue
@@ -1635,9 +1339,7 @@
         errorLine1="    public abstract long getStartDelay(ViewGroup sceneRoot, Transition transition,"
         errorLine2="                                       ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionPropagation.java"
-            line="47"
-            column="40"/>
+            file="src/main/java/androidx/transition/TransitionPropagation.java"/>
     </issue>
 
     <issue
@@ -1646,9 +1348,7 @@
         errorLine1="    public abstract long getStartDelay(ViewGroup sceneRoot, Transition transition,"
         errorLine2="                                                            ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionPropagation.java"
-            line="47"
-            column="61"/>
+            file="src/main/java/androidx/transition/TransitionPropagation.java"/>
     </issue>
 
     <issue
@@ -1657,9 +1357,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues);"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionPropagation.java"
-            line="48"
-            column="13"/>
+            file="src/main/java/androidx/transition/TransitionPropagation.java"/>
     </issue>
 
     <issue
@@ -1668,9 +1366,7 @@
         errorLine1="            TransitionValues startValues, TransitionValues endValues);"
         errorLine2="                                          ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionPropagation.java"
-            line="48"
-            column="43"/>
+            file="src/main/java/androidx/transition/TransitionPropagation.java"/>
     </issue>
 
     <issue
@@ -1679,9 +1375,7 @@
         errorLine1="    public abstract void captureValues(TransitionValues transitionValues);"
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionPropagation.java"
-            line="75"
-            column="40"/>
+            file="src/main/java/androidx/transition/TransitionPropagation.java"/>
     </issue>
 
     <issue
@@ -1690,9 +1384,7 @@
         errorLine1="    public abstract String[] getPropagationProperties();"
         errorLine2="                    ~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionPropagation.java"
-            line="89"
-            column="21"/>
+            file="src/main/java/androidx/transition/TransitionPropagation.java"/>
     </issue>
 
     <issue
@@ -1701,9 +1393,7 @@
         errorLine1="    public void setPathMotion(PathMotion pathMotion) {"
         errorLine2="                              ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionSet.java"
-            line="389"
-            column="31"/>
+            file="src/main/java/androidx/transition/TransitionSet.java"/>
     </issue>
 
     <issue
@@ -1712,9 +1402,7 @@
         errorLine1="    public void pause(View sceneRoot) {"
         errorLine2="                      ~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionSet.java"
-            line="554"
-            column="23"/>
+            file="src/main/java/androidx/transition/TransitionSet.java"/>
     </issue>
 
     <issue
@@ -1723,9 +1411,7 @@
         errorLine1="    public void resume(View sceneRoot) {"
         errorLine2="                       ~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionSet.java"
-            line="565"
-            column="24"/>
+            file="src/main/java/androidx/transition/TransitionSet.java"/>
     </issue>
 
     <issue
@@ -1734,9 +1420,7 @@
         errorLine1="    public void setPropagation(TransitionPropagation transitionPropagation) {"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionSet.java"
-            line="605"
-            column="32"/>
+            file="src/main/java/androidx/transition/TransitionSet.java"/>
     </issue>
 
     <issue
@@ -1745,9 +1429,7 @@
         errorLine1="    public void setEpicenterCallback(EpicenterCallback epicenterCallback) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionSet.java"
-            line="615"
-            column="38"/>
+            file="src/main/java/androidx/transition/TransitionSet.java"/>
     </issue>
 
     <issue
@@ -1756,9 +1438,7 @@
         errorLine1="    public Transition clone() {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionSet.java"
-            line="634"
-            column="12"/>
+            file="src/main/java/androidx/transition/TransitionSet.java"/>
     </issue>
 
     <issue
@@ -1767,9 +1447,7 @@
         errorLine1="    public View view;"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/transition/TransitionValues.java"
-            line="65"
-            column="12"/>
+            file="src/main/java/androidx/transition/TransitionValues.java"/>
     </issue>
 
     <issue
@@ -1778,9 +1456,7 @@
         errorLine1="    public boolean isVisible(TransitionValues values) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="183"
-            column="30"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1789,9 +1465,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, TransitionValues startValues, int startVisibility,"
         errorLine2="                             ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="282"
-            column="30"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1800,9 +1474,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, TransitionValues startValues, int startVisibility,"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="282"
-            column="51"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1811,9 +1483,7 @@
         errorLine1="            TransitionValues endValues, int endVisibility) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="283"
-            column="13"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1822,9 +1492,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,"
         errorLine2="                             ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="319"
-            column="30"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1833,9 +1501,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,"
         errorLine2="                                                  ~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="319"
-            column="51"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1844,9 +1510,7 @@
         errorLine1="    public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="319"
-            column="62"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1855,9 +1519,7 @@
         errorLine1="            TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="320"
-            column="13"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1866,9 +1528,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, TransitionValues startValues,"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="341"
-            column="33"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1877,9 +1537,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, TransitionValues startValues,"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="341"
-            column="54"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1888,9 +1546,7 @@
         errorLine1="            int startVisibility, TransitionValues endValues, int endVisibility) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="342"
-            column="34"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1899,9 +1555,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, View view, TransitionValues startValues,"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="504"
-            column="33"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1910,9 +1564,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, View view, TransitionValues startValues,"
         errorLine2="                                                     ~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="504"
-            column="54"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1921,9 +1573,7 @@
         errorLine1="    public Animator onDisappear(ViewGroup sceneRoot, View view, TransitionValues startValues,"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="504"
-            column="65"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1932,9 +1582,7 @@
         errorLine1="            TransitionValues endValues) {"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/Visibility.java"
-            line="505"
-            column="13"/>
+            file="src/main/java/androidx/transition/Visibility.java"/>
     </issue>
 
     <issue
@@ -1943,9 +1591,7 @@
         errorLine1="    public void captureValues(TransitionValues transitionValues) {"
         errorLine2="                              ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/VisibilityPropagation.java"
-            line="44"
-            column="31"/>
+            file="src/main/java/androidx/transition/VisibilityPropagation.java"/>
     </issue>
 
     <issue
@@ -1954,9 +1600,7 @@
         errorLine1="    public String[] getPropagationProperties() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/VisibilityPropagation.java"
-            line="61"
-            column="12"/>
+            file="src/main/java/androidx/transition/VisibilityPropagation.java"/>
     </issue>
 
     <issue
@@ -1965,9 +1609,7 @@
         errorLine1="    public int getViewVisibility(TransitionValues values) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/VisibilityPropagation.java"
-            line="72"
-            column="34"/>
+            file="src/main/java/androidx/transition/VisibilityPropagation.java"/>
     </issue>
 
     <issue
@@ -1976,9 +1618,7 @@
         errorLine1="    public int getViewX(TransitionValues values) {"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/VisibilityPropagation.java"
-            line="90"
-            column="25"/>
+            file="src/main/java/androidx/transition/VisibilityPropagation.java"/>
     </issue>
 
     <issue
@@ -1987,9 +1627,7 @@
         errorLine1="    public int getViewY(TransitionValues values) {"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/transition/VisibilityPropagation.java"
-            line="101"
-            column="25"/>
+            file="src/main/java/androidx/transition/VisibilityPropagation.java"/>
     </issue>
 
 </issues>
diff --git a/tvprovider/tvprovider/lint-baseline.xml b/tvprovider/tvprovider/lint-baseline.xml
index ad2540d..739a5b3 100644
--- a/tvprovider/tvprovider/lint-baseline.xml
+++ b/tvprovider/tvprovider/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            return TvContract.buildRecordedProgramUri(recordedProgramId);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="457"
-            column="31"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            return TvContract.isChannelUri(uri);"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="518"
-            column="31"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            return TvContract.isChannelUriForTunerInput(uri);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="529"
-            column="31"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            return TvContract.isChannelUriForPassthroughInput(uri);"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="540"
-            column="31"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            return TvContract.isProgramUri(uri);"
         errorLine2="                              ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="551"
-            column="31"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            TvContract.requestChannelBrowsable(context, channelId);"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="579"
-            column="24"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="public class ChannelLogoUtils {"
         errorLine2="             ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java"
-            line="43"
-            column="14"/>
+            file="src/main/java/androidx/tvprovider/media/tv/ChannelLogoUtils.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public String getInternalProviderId() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="160"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public Uri getPreviewVideoUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="168"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public Uri getIntentUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="196"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public Intent getIntent() throws URISyntaxException {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="205"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public Uri getLogoUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="259"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public String getStartingPrice() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="277"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public String getOfferPrice() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="285"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public String getReleaseDate() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="293"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public String getAuthor() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="337"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public String getContentId() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="354"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public String getLogoContentDescription() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="364"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public String getGenre() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="372"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public Uri getPreviewAudioUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="398"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public ContentValues toContentValues() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="416"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public ContentValues toContentValues(boolean includeProtectedFields) {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="428"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="        public Builder(BasePreviewProgram other) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="649"
-            column="24"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="        public T setInternalProviderId(String externalId) {"
         errorLine2="                                       ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="661"
-            column="40"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="        public T setPreviewVideoUri(Uri previewVideoUri) {"
         errorLine2="                                    ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="673"
-            column="37"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="        public T setIntentUri(Uri intentUri) {"
         errorLine2="                              ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="711"
-            column="31"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="        public T setIntent(Intent intent) {"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="723"
-            column="28"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="        public T setLogoUri(Uri logoUri) {"
         errorLine2="                            ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="820"
-            column="29"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="        public T setStartingPrice(String price) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="859"
-            column="35"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="        public T setOfferPrice(String price) {"
         errorLine2="                               ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="871"
-            column="32"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="        public T setReleaseDate(String releaseDate) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="886"
-            column="33"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="        public T setReleaseDate(Date releaseDate) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="898"
-            column="33"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="        public T setAuthor(String author) {"
         errorLine2="                           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="972"
-            column="28"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="        public T setContentId(String contentId) {"
         errorLine2="                              ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="998"
-            column="31"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="        public T setLogoContentDescription(String logoContentDescription) {"
         errorLine2="                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1013"
-            column="44"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="        public T setGenre(String genre) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1025"
-            column="27"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="        public T setPreviewAudioUri(Uri previewAudioUri) {"
         errorLine2="                                    ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"
-            line="1062"
-            column="37"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    protected ContentValues mValues;"
         errorLine2="              ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="74"
-            column="15"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    public String getPackageName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="96"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    public String getTitle() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="104"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    public String getEpisodeTitle() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="112"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    public String getSeasonNumber() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="121"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    public String getEpisodeNumber() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="134"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public String getDescription() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="146"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public String getLongDescription() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="154"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    public @Genre String[] getCanonicalGenres() {"
         errorLine2="                  ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="180"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    public TvContentRating[] getContentRatings() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="188"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public Uri getPosterArtUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="197"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public Uri getThumbnailUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="206"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    public byte[] getInternalProviderDataByteArray() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="215"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    public String[] getAudioLanguages() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="223"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    public Long getInternalProviderFlag1() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="241"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="    public Long getInternalProviderFlag2() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="249"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public Long getInternalProviderFlag3() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="257"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    public Long getInternalProviderFlag4() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="265"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public String getSeasonTitle() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="273"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="    public String getReviewRating() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="290"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -634,9 +520,7 @@
         errorLine1="    public ContentValues toContentValues() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="326"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -645,9 +529,7 @@
         errorLine1="        protected ContentValues mValues;"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="545"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -656,9 +538,7 @@
         errorLine1="        public Builder(BaseProgram other) {"
         errorLine2="                       ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="558"
-            column="24"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -667,9 +547,7 @@
         errorLine1="        public T setPackageName(String packageName) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="583"
-            column="33"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -678,9 +556,7 @@
         errorLine1="        public T setTitle(String title) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="595"
-            column="27"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -689,9 +565,7 @@
         errorLine1="        public T setEpisodeTitle(String episodeTitle) {"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="607"
-            column="34"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -700,9 +574,7 @@
         errorLine1="        public T setSeasonNumber(String seasonNumber, int numericalSeasonNumber) {"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="636"
-            column="34"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -711,9 +583,7 @@
         errorLine1="        public T setEpisodeNumber(String episodeNumber, int numericalEpisodeNumber) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="669"
-            column="35"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -722,9 +592,7 @@
         errorLine1="        public T setDescription(String description) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="686"
-            column="33"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -733,9 +601,7 @@
         errorLine1="        public T setLongDescription(String longDescription) {"
         errorLine2="                                    ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="698"
-            column="37"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -744,9 +610,7 @@
         errorLine1="        public T setContentRatings(TvContentRating[] contentRatings) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="736"
-            column="36"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -755,9 +619,7 @@
         errorLine1="        public T setPosterArtUri(Uri posterArtUri) {"
         errorLine2="                                 ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="749"
-            column="34"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -766,9 +628,7 @@
         errorLine1="        public T setThumbnailUri(Uri thumbnailUri) {"
         errorLine2="                                 ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="762"
-            column="34"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -777,9 +637,7 @@
         errorLine1="        public T setCanonicalGenres(@Genre String[] genres) {"
         errorLine2="                                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="777"
-            column="44"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -788,9 +646,7 @@
         errorLine1="        public T setInternalProviderData(byte[] data) {"
         errorLine2="                                         ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="789"
-            column="42"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -799,9 +655,7 @@
         errorLine1="        public T setAudioLanguages(String[] audioLanguages) {"
         errorLine2="                                   ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="801"
-            column="36"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -810,9 +664,7 @@
         errorLine1="        public T setReviewRating(String reviewRating) {"
         errorLine2="                                 ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="904"
-            column="34"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -821,9 +673,7 @@
         errorLine1="        public T setSeasonTitle(String seasonTitle) {"
         errorLine2="                                ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"
-            line="916"
-            column="33"/>
+            file="src/main/java/androidx/tvprovider/media/tv/BaseProgram.java"/>
     </issue>
 
     <issue
@@ -832,9 +682,7 @@
         errorLine1="    public String getPackageName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="112"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -843,9 +691,7 @@
         errorLine1="    public String getInputId() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="119"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -854,9 +700,7 @@
         errorLine1="    public @Channels.Type String getType() {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="126"
-            column="27"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -865,9 +709,7 @@
         errorLine1="    public String getDisplayNumber() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="133"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -876,9 +718,7 @@
         errorLine1="    public String getDisplayName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="140"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -887,9 +727,7 @@
         errorLine1="    public String getDescription() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="147"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -898,9 +736,7 @@
         errorLine1="    public @VideoFormat String getVideoFormat() {"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="154"
-            column="25"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -909,9 +745,7 @@
         errorLine1="    public String getAppLinkText() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="185"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -920,9 +754,7 @@
         errorLine1="    public Uri getAppLinkIconUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="200"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -931,9 +763,7 @@
         errorLine1="    public Uri getAppLinkPosterArtUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="208"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -942,9 +772,7 @@
         errorLine1="    public Uri getAppLinkIntentUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="216"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -953,9 +781,7 @@
         errorLine1="    public Intent getAppLinkIntent() throws URISyntaxException {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="224"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -964,9 +790,7 @@
         errorLine1="    public String getNetworkAffiliation() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="232"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -975,9 +799,7 @@
         errorLine1="    public byte[] getInternalProviderDataByteArray() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="247"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -986,9 +808,7 @@
         errorLine1="    public @ServiceType String getServiceType() {"
         errorLine2="                        ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="257"
-            column="25"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -997,9 +817,7 @@
         errorLine1="    public Long getInternalProviderFlag1() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="264"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1008,9 +826,7 @@
         errorLine1="    public Long getInternalProviderFlag2() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="271"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1019,9 +835,7 @@
         errorLine1="    public Long getInternalProviderFlag3() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="278"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1030,9 +844,7 @@
         errorLine1="    public Long getInternalProviderFlag4() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="285"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1041,9 +853,7 @@
         errorLine1="    public String getInternalProviderId() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="292"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1052,9 +862,7 @@
         errorLine1="    public String getSystemChannelKey() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="332"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1063,9 +871,7 @@
         errorLine1="    public ContentValues toContentValues() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="373"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1074,9 +880,7 @@
         errorLine1="    public ContentValues toContentValues(boolean includeProtectedFields) {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="385"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1085,9 +889,7 @@
         errorLine1="    public static Channel fromCursor(Cursor cursor) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="424"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1096,9 +898,7 @@
         errorLine1="    public static Channel fromCursor(Cursor cursor) {"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="424"
-            column="38"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1107,9 +907,7 @@
         errorLine1="        public Builder(Channel other) {"
         errorLine2="                       ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="630"
-            column="24"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1118,9 +916,7 @@
         errorLine1="        public Builder setInputId(String inputId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="664"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1129,9 +925,7 @@
         errorLine1="        public Builder setInputId(String inputId) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="664"
-            column="35"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1140,9 +934,7 @@
         errorLine1="        public Builder setType(@Channels.Type String type) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="675"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1151,9 +943,7 @@
         errorLine1="        public Builder setType(@Channels.Type String type) {"
         errorLine2="                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="675"
-            column="47"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1162,9 +952,7 @@
         errorLine1="        public Builder setDisplayNumber(String displayNumber) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="686"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1173,9 +961,7 @@
         errorLine1="        public Builder setDisplayNumber(String displayNumber) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="686"
-            column="41"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1184,9 +970,7 @@
         errorLine1="        public Builder setDisplayName(String displayName) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="697"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1195,9 +979,7 @@
         errorLine1="        public Builder setDisplayName(String displayName) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="697"
-            column="39"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1206,9 +988,7 @@
         errorLine1="        public Builder setDescription(String description) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="708"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1217,9 +997,7 @@
         errorLine1="        public Builder setDescription(String description) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="708"
-            column="39"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1228,9 +1006,7 @@
         errorLine1="        public Builder setVideoFormat(@VideoFormat String videoFormat) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="719"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1239,9 +1015,7 @@
         errorLine1="        public Builder setVideoFormat(@VideoFormat String videoFormat) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="719"
-            column="52"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1250,9 +1024,7 @@
         errorLine1="        public Builder setOriginalNetworkId(int originalNetworkId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="731"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1261,9 +1033,7 @@
         errorLine1="        public Builder setTransportStreamId(int transportStreamId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="743"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1272,9 +1042,7 @@
         errorLine1="        public Builder setServiceId(int serviceId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="754"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1283,9 +1051,7 @@
         errorLine1="        public Builder setInternalProviderData(byte[] internalProviderData) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="766"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1294,9 +1060,7 @@
         errorLine1="        public Builder setInternalProviderData(byte[] internalProviderData) {"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="766"
-            column="48"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1305,9 +1069,7 @@
         errorLine1="        public Builder setInternalProviderData(String internalProviderData) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="778"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1316,9 +1078,7 @@
         errorLine1="        public Builder setInternalProviderData(String internalProviderData) {"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="778"
-            column="48"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1327,9 +1087,7 @@
         errorLine1="        public Builder setAppLinkText(String appLinkText) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="790"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1338,9 +1096,7 @@
         errorLine1="        public Builder setAppLinkText(String appLinkText) {"
         errorLine2="                                      ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="790"
-            column="39"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1349,9 +1105,7 @@
         errorLine1="        public Builder setAppLinkColor(int appLinkColor) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="801"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1360,9 +1114,7 @@
         errorLine1="        public Builder setAppLinkIconUri(Uri appLinkIconUri) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="813"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1371,9 +1123,7 @@
         errorLine1="        public Builder setAppLinkIconUri(Uri appLinkIconUri) {"
         errorLine2="                                         ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="813"
-            column="42"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1382,9 +1132,7 @@
         errorLine1="        public Builder setAppLinkPosterArtUri(Uri appLinkPosterArtUri) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="826"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1393,9 +1141,7 @@
         errorLine1="        public Builder setAppLinkPosterArtUri(Uri appLinkPosterArtUri) {"
         errorLine2="                                              ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="826"
-            column="47"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1404,9 +1150,7 @@
         errorLine1="        public Builder setAppLinkIntent(Intent appLinkIntent) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="838"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1415,9 +1159,7 @@
         errorLine1="        public Builder setAppLinkIntent(Intent appLinkIntent) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="838"
-            column="41"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1426,9 +1168,7 @@
         errorLine1="        public Builder setAppLinkIntentUri(Uri appLinkIntentUri) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="851"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1437,9 +1177,7 @@
         errorLine1="        public Builder setAppLinkIntentUri(Uri appLinkIntentUri) {"
         errorLine2="                                           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="851"
-            column="44"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1448,9 +1186,7 @@
         errorLine1="        public Builder setNetworkAffiliation(String networkAffiliation) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="864"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1459,9 +1195,7 @@
         errorLine1="        public Builder setNetworkAffiliation(String networkAffiliation) {"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="864"
-            column="46"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1470,9 +1204,7 @@
         errorLine1="        public Builder setSearchable(boolean searchable) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="875"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1481,9 +1213,7 @@
         errorLine1="        public Builder setServiceType(@ServiceType String serviceType) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="888"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1492,9 +1222,7 @@
         errorLine1="        public Builder setServiceType(@ServiceType String serviceType) {"
         errorLine2="                                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="888"
-            column="52"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1503,9 +1231,7 @@
         errorLine1="        public Builder setInternalProviderFlag1(long flag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="899"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1514,9 +1240,7 @@
         errorLine1="        public Builder setInternalProviderFlag2(long flag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="910"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1525,9 +1249,7 @@
         errorLine1="        public Builder setInternalProviderFlag3(long flag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="921"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1536,9 +1258,7 @@
         errorLine1="        public Builder setInternalProviderFlag4(long flag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="932"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1547,9 +1267,7 @@
         errorLine1="        public Builder setInternalProviderId(String internalProviderId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="944"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1558,9 +1276,7 @@
         errorLine1="        public Builder setInternalProviderId(String internalProviderId) {"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="944"
-            column="46"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1569,9 +1285,7 @@
         errorLine1="        public Builder setTransient(boolean value) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="955"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1580,9 +1294,7 @@
         errorLine1="        public Builder setBrowsable(boolean value) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="968"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1591,9 +1303,7 @@
         errorLine1="        public Builder setSystemApproved(boolean value) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="981"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1602,9 +1312,7 @@
         errorLine1="        public Builder setConfigurationDisplayOrder(int value) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="994"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1613,9 +1321,7 @@
         errorLine1="        public Builder setSystemChannelKey(String value) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="1008"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1624,9 +1330,7 @@
         errorLine1="        public Builder setSystemChannelKey(String value) {"
         errorLine2="                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="1008"
-            column="44"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1635,9 +1339,7 @@
         errorLine1="        public Builder setLocked(boolean value) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="1033"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1646,9 +1348,7 @@
         errorLine1="        public Channel build() {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"
-            line="1042"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Channel.java"/>
     </issue>
 
     <issue
@@ -1657,9 +1357,7 @@
         errorLine1="    public static &lt;T> T[] concatAll(T[] first, T[]... rest) {"
         errorLine2="                      ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java"
-            line="37"
-            column="23"/>
+            file="src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java"/>
     </issue>
 
     <issue
@@ -1668,9 +1366,7 @@
         errorLine1="    public static &lt;T> T[] concatAll(T[] first, T[]... rest) {"
         errorLine2="                                    ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java"
-            line="37"
-            column="37"/>
+            file="src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java"/>
     </issue>
 
     <issue
@@ -1679,9 +1375,7 @@
         errorLine1="    public static &lt;T> T[] concatAll(T[] first, T[]... rest) {"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java"
-            line="37"
-            column="48"/>
+            file="src/main/java/androidx/tvprovider/media/tv/CollectionUtils.java"/>
     </issue>
 
     <issue
@@ -1690,9 +1384,7 @@
         errorLine1="    public static PreviewChannel fromCursor(Cursor cursor) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="92"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1701,9 +1393,7 @@
         errorLine1="    public static PreviewChannel fromCursor(Cursor cursor) {"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="92"
-            column="45"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1712,9 +1402,7 @@
         errorLine1="    public String getPackageName() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="120"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1723,9 +1411,7 @@
         errorLine1="    public String getType() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="129"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1734,9 +1420,7 @@
         errorLine1="    public CharSequence getDisplayName() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="136"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1745,9 +1429,7 @@
         errorLine1="    public CharSequence getDescription() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="144"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1756,9 +1438,7 @@
         errorLine1="    public Uri getAppLinkIntentUri() {"
         errorLine2="           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="151"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1767,9 +1447,7 @@
         errorLine1="    public Intent getAppLinkIntent() throws URISyntaxException {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="159"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1778,9 +1456,7 @@
         errorLine1="    public Bitmap getLogo(Context context) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="171"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1789,9 +1465,7 @@
         errorLine1="    public Bitmap getLogo(Context context) {"
         errorLine2="                          ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="171"
-            column="27"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1800,9 +1474,7 @@
         errorLine1="    public byte[] getInternalProviderDataByteArray() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="205"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1811,9 +1483,7 @@
         errorLine1="    public Long getInternalProviderFlag1() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="212"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1822,9 +1492,7 @@
         errorLine1="    public Long getInternalProviderFlag2() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="219"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1833,9 +1501,7 @@
         errorLine1="    public Long getInternalProviderFlag3() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="226"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1844,9 +1510,7 @@
         errorLine1="    public Long getInternalProviderFlag4() {"
         errorLine2="           ~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="233"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1855,9 +1519,7 @@
         errorLine1="    public String getInternalProviderId() {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="240"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1866,9 +1528,7 @@
         errorLine1="    public boolean hasAnyUpdatedValues(PreviewChannel update) {"
         errorLine2="                                       ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="271"
-            column="40"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1877,9 +1537,7 @@
         errorLine1="    public ContentValues toContentValues() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="296"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1888,9 +1546,7 @@
         errorLine1="        public Builder(PreviewChannel other) {"
         errorLine2="                       ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="353"
-            column="24"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1899,9 +1555,7 @@
         errorLine1="        public Builder setDisplayName(CharSequence displayName) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="388"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1910,9 +1564,7 @@
         errorLine1="        public Builder setDisplayName(CharSequence displayName) {"
         errorLine2="                                      ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="388"
-            column="39"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1921,9 +1573,7 @@
         errorLine1="        public Builder setAppLinkIntent(Intent appLinkIntent) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="416"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1932,9 +1582,7 @@
         errorLine1="        public Builder setAppLinkIntent(Intent appLinkIntent) {"
         errorLine2="                                        ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="416"
-            column="41"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1943,9 +1591,7 @@
         errorLine1="        public Builder setAppLinkIntentUri(Uri appLinkIntentUri) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="428"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1954,9 +1600,7 @@
         errorLine1="        public Builder setAppLinkIntentUri(Uri appLinkIntentUri) {"
         errorLine2="                                           ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="428"
-            column="44"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1965,9 +1609,7 @@
         errorLine1="        public Builder setInternalProviderId(String internalProviderId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="447"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1976,9 +1618,7 @@
         errorLine1="        public Builder setInternalProviderId(String internalProviderId) {"
         errorLine2="                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="447"
-            column="46"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1987,9 +1627,7 @@
         errorLine1="        public Builder setInternalProviderData(byte[] internalProviderData) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="462"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -1998,9 +1636,7 @@
         errorLine1="        public Builder setInternalProviderData(byte[] internalProviderData) {"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="462"
-            column="48"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -2009,9 +1645,7 @@
         errorLine1="        public Builder setInternalProviderFlag1(long flag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="477"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -2020,9 +1654,7 @@
         errorLine1="        public Builder setInternalProviderFlag2(long flag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="492"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -2031,9 +1663,7 @@
         errorLine1="        public Builder setInternalProviderFlag3(long flag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="507"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -2042,9 +1672,7 @@
         errorLine1="        public Builder setInternalProviderFlag4(long flag) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="522"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -2053,9 +1681,7 @@
         errorLine1="        public Builder setLogo(@NonNull Bitmap logoImage) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="533"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -2064,9 +1690,7 @@
         errorLine1="        public Builder setLogo(@NonNull Uri logoUri) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="545"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -2075,9 +1699,7 @@
         errorLine1="        public PreviewChannel build() {"
         errorLine2="               ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"
-            line="556"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannel.java"/>
     </issue>
 
     <issue
@@ -2086,9 +1708,7 @@
         errorLine1="    public PreviewChannelHelper(Context context) {"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java"
-            line="79"
-            column="33"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java"/>
     </issue>
 
     <issue
@@ -2097,9 +1717,7 @@
         errorLine1="    public PreviewChannelHelper(Context context, int urlConnectionTimeoutMillis,"
         errorLine2="                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java"
-            line="87"
-            column="33"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java"/>
     </issue>
 
     <issue
@@ -2108,9 +1726,7 @@
         errorLine1="    public List&lt;PreviewChannel> getAllChannels() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java"
-            line="192"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java"/>
     </issue>
 
     <issue
@@ -2119,9 +1735,7 @@
         errorLine1="    protected Bitmap downloadBitmap(@NonNull Uri logoUri) throws IOException {"
         errorLine2="              ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java"
-            line="350"
-            column="15"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewChannelHelper.java"/>
     </issue>
 
     <issue
@@ -2130,9 +1744,7 @@
         errorLine1="    public boolean hasAnyUpdatedValues(PreviewProgram update) {"
         errorLine2="                                       ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="120"
-            column="40"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2141,9 +1753,7 @@
         errorLine1="    public ContentValues toContentValues() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="142"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2152,9 +1762,7 @@
         errorLine1="    public ContentValues toContentValues(boolean includeProtectedFields) {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="155"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2163,9 +1771,7 @@
         errorLine1="    public static PreviewProgram fromCursor(Cursor cursor) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="171"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2174,9 +1780,7 @@
         errorLine1="    public static PreviewProgram fromCursor(Cursor cursor) {"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="171"
-            column="45"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2185,9 +1789,7 @@
         errorLine1="        public Builder(PreviewProgram other) {"
         errorLine2="                       ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="211"
-            column="24"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2196,9 +1798,7 @@
         errorLine1="        public Builder setChannelId(long channelId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="221"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2207,9 +1807,7 @@
         errorLine1="        public Builder setWeight(int weight) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="232"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2218,9 +1816,7 @@
         errorLine1="        public PreviewProgram build() {"
         errorLine2="               ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"
-            line="240"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/PreviewProgram.java"/>
     </issue>
 
     <issue
@@ -2229,9 +1825,7 @@
         errorLine1="    public String[] getBroadcastGenres() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="117"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2240,9 +1834,7 @@
         errorLine1="    public ContentValues toContentValues() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="182"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2251,9 +1843,7 @@
         errorLine1="    public static Program fromCursor(Cursor cursor) {"
         errorLine2="                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="200"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2262,9 +1852,7 @@
         errorLine1="    public static Program fromCursor(Cursor cursor) {"
         errorLine2="                                     ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="200"
-            column="38"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2273,9 +1861,7 @@
         errorLine1="        public Builder(Program other) {"
         errorLine2="                       ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="280"
-            column="24"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2284,9 +1870,7 @@
         errorLine1="        public Builder setChannelId(long channelId) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="290"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2295,9 +1879,7 @@
         errorLine1="        public Builder setStartTimeUtcMillis(long startTimeUtcMillis) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="302"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2306,9 +1888,7 @@
         errorLine1="        public Builder setEndTimeUtcMillis(long endTimeUtcMillis) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="314"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2317,9 +1897,7 @@
         errorLine1="        public Builder setBroadcastGenres(@Genre String[] genres) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="327"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2328,9 +1906,7 @@
         errorLine1="        public Builder setBroadcastGenres(@Genre String[] genres) {"
         errorLine2="                                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="327"
-            column="50"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2339,9 +1915,7 @@
         errorLine1="        public Builder setRecordingProhibited(boolean prohibited) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="339"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2350,9 +1924,7 @@
         errorLine1="        public Program build() {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/Program.java"
-            line="377"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/Program.java"/>
     </issue>
 
     <issue
@@ -2361,9 +1933,7 @@
         errorLine1="    public static String buildInputId(ComponentName name) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="343"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2372,9 +1942,7 @@
         errorLine1="    public static String buildInputId(ComponentName name) {"
         errorLine2="                                      ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="343"
-            column="39"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2383,9 +1951,7 @@
         errorLine1="    public static Uri buildChannelUri(long channelId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="352"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2394,9 +1960,7 @@
         errorLine1="    public static Uri buildChannelUriForPassthroughInput(String inputId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="361"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2405,9 +1969,7 @@
         errorLine1="    public static Uri buildChannelUriForPassthroughInput(String inputId) {"
         errorLine2="                                                         ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="361"
-            column="58"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2416,9 +1978,7 @@
         errorLine1="    public static Uri buildChannelLogoUri(long channelId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="370"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2427,9 +1987,7 @@
         errorLine1="    public static Uri buildChannelLogoUri(Uri channelUri) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="379"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2438,9 +1996,7 @@
         errorLine1="    public static Uri buildChannelLogoUri(Uri channelUri) {"
         errorLine2="                                          ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="379"
-            column="43"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2449,9 +2005,7 @@
         errorLine1="    public static Uri buildChannelsUriForInput(@Nullable String inputId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="389"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2460,9 +2014,7 @@
         errorLine1="    public static Uri buildProgramUri(long programId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="398"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2471,9 +2023,7 @@
         errorLine1="    public static Uri buildProgramsUriForChannel(long channelId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="407"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2482,9 +2032,7 @@
         errorLine1="    public static Uri buildProgramsUriForChannel(Uri channelUri) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="416"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2493,9 +2041,7 @@
         errorLine1="    public static Uri buildProgramsUriForChannel(Uri channelUri) {"
         errorLine2="                                                 ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="416"
-            column="50"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2504,9 +2050,7 @@
         errorLine1="    public static Uri buildProgramsUriForChannel(long channelId, long startTime,"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="430"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2515,9 +2059,7 @@
         errorLine1="    public static Uri buildProgramsUriForChannel(Uri channelUri, long startTime,"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="445"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2526,9 +2068,7 @@
         errorLine1="    public static Uri buildProgramsUriForChannel(Uri channelUri, long startTime,"
         errorLine2="                                                 ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="445"
-            column="50"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2537,9 +2077,7 @@
         errorLine1="    public static Uri buildRecordedProgramUri(long recordedProgramId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="455"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2548,9 +2086,7 @@
         errorLine1="    public static Uri buildPreviewProgramUri(long previewProgramId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="468"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2559,9 +2095,7 @@
         errorLine1="    public static Uri buildPreviewProgramsUriForChannel(long channelId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="477"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2570,9 +2104,7 @@
         errorLine1="    public static Uri buildPreviewProgramsUriForChannel(Uri channelUri) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="487"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2581,9 +2113,7 @@
         errorLine1="    public static Uri buildPreviewProgramsUriForChannel(Uri channelUri) {"
         errorLine2="                                                        ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="487"
-            column="57"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2592,9 +2122,7 @@
         errorLine1="    public static Uri buildWatchNextProgramUri(long watchNextProgramId) {"
         errorLine2="                  ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="499"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2603,9 +2131,7 @@
         errorLine1="    public static boolean isChannelUri(Uri uri) {"
         errorLine2="                                       ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="516"
-            column="40"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2614,9 +2140,7 @@
         errorLine1="    public static boolean isChannelUriForTunerInput(Uri uri) {"
         errorLine2="                                                    ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="527"
-            column="53"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2625,9 +2149,7 @@
         errorLine1="    public static boolean isChannelUriForPassthroughInput(Uri uri) {"
         errorLine2="                                                          ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="538"
-            column="59"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2636,9 +2158,7 @@
         errorLine1="    public static boolean isProgramUri(Uri uri) {"
         errorLine2="                                       ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="549"
-            column="40"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2647,9 +2167,7 @@
         errorLine1="    public static boolean isRecordedProgramUri(Uri uri) {"
         errorLine2="                                               ~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="560"
-            column="48"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2658,9 +2176,7 @@
         errorLine1="    public static void requestChannelBrowsable(Context context, long channelId) {"
         errorLine2="                                               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="577"
-            column="48"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2669,9 +2185,7 @@
         errorLine1="        public static String getVideoResolution(@VideoFormat String videoFormat) {"
         errorLine2="                                                             ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="1900"
-            column="62"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2680,9 +2194,7 @@
         errorLine1="            public static String encode(@NonNull @Genre String... genres) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2662"
-            column="27"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2691,9 +2203,7 @@
         errorLine1="            public static @Genre String[] decode(@NonNull String genres) {"
         errorLine2="                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2701"
-            column="34"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2702,9 +2212,7 @@
         errorLine1="            public static boolean isCanonical(String genre) {"
         errorLine2="                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"
-            line="2749"
-            column="47"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractCompat.java"/>
     </issue>
 
     <issue
@@ -2713,9 +2221,7 @@
         errorLine1="    public static TvContentRating[] stringToContentRatings(String commaSeparatedRatings) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"
-            line="48"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"/>
     </issue>
 
     <issue
@@ -2724,9 +2230,7 @@
         errorLine1="    public static TvContentRating[] stringToContentRatings(String commaSeparatedRatings) {"
         errorLine2="                                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"
-            line="48"
-            column="60"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"/>
     </issue>
 
     <issue
@@ -2735,9 +2239,7 @@
         errorLine1="    public static String contentRatingsToString(TvContentRating[] contentRatings) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"
-            line="71"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"/>
     </issue>
 
     <issue
@@ -2746,9 +2248,7 @@
         errorLine1="    public static String contentRatingsToString(TvContentRating[] contentRatings) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"
-            line="71"
-            column="49"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"/>
     </issue>
 
     <issue
@@ -2757,9 +2257,7 @@
         errorLine1="    public static String[] stringToAudioLanguages(String commaSeparatedString) {"
         errorLine2="                  ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"
-            line="89"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"/>
     </issue>
 
     <issue
@@ -2768,9 +2266,7 @@
         errorLine1="    public static String[] stringToAudioLanguages(String commaSeparatedString) {"
         errorLine2="                                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"
-            line="89"
-            column="51"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"/>
     </issue>
 
     <issue
@@ -2779,9 +2275,7 @@
         errorLine1="    public static String audioLanguagesToString(String[] audioLanguages) {"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"
-            line="102"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"/>
     </issue>
 
     <issue
@@ -2790,9 +2284,7 @@
         errorLine1="    public static String audioLanguagesToString(String[] audioLanguages) {"
         errorLine2="                                                ~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"
-            line="102"
-            column="49"/>
+            file="src/main/java/androidx/tvprovider/media/tv/TvContractUtils.java"/>
     </issue>
 
     <issue
@@ -2801,9 +2293,7 @@
         errorLine1="    public boolean hasAnyUpdatedValues(WatchNextProgram update) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="142"
-            column="40"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
     <issue
@@ -2812,9 +2302,7 @@
         errorLine1="    public ContentValues toContentValues() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="164"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
     <issue
@@ -2823,9 +2311,7 @@
         errorLine1="    public ContentValues toContentValues(boolean includeProtectedFields) {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="177"
-            column="12"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
     <issue
@@ -2834,9 +2320,7 @@
         errorLine1="    public static WatchNextProgram fromCursor(Cursor cursor) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="193"
-            column="19"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
     <issue
@@ -2845,9 +2329,7 @@
         errorLine1="    public static WatchNextProgram fromCursor(Cursor cursor) {"
         errorLine2="                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="193"
-            column="47"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
     <issue
@@ -2856,9 +2338,7 @@
         errorLine1="        public Builder(WatchNextProgram other) {"
         errorLine2="                       ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="234"
-            column="24"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
     <issue
@@ -2867,9 +2347,7 @@
         errorLine1="        public Builder setWatchNextType(@WatchNextType int watchNextType) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="250"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
     <issue
@@ -2878,9 +2356,7 @@
         errorLine1="        public Builder setLastEngagementTimeUtcMillis(long lastEngagementTimeUtcMillis) {"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="263"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
     <issue
@@ -2889,9 +2365,7 @@
         errorLine1="        public WatchNextProgram build() {"
         errorLine2="               ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"
-            line="272"
-            column="16"/>
+            file="src/main/java/androidx/tvprovider/media/tv/WatchNextProgram.java"/>
     </issue>
 
 </issues>
diff --git a/vectordrawable/integration-tests/testapp/lint-baseline.xml b/vectordrawable/integration-tests/testapp/lint-baseline.xml
index 50e5c2c..6c79993 100644
--- a/vectordrawable/integration-tests/testapp/lint-baseline.xml
+++ b/vectordrawable/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/animation_vector_drawable_grouping_1.xml"
-            line="16"
-            column="2"/>
+            file="src/main/res/drawable/animation_vector_drawable_grouping_1.xml"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/animation_vector_drawable_grouping_1_path_motion.xml"
-            line="16"
-            column="2"/>
+            file="src/main/res/drawable/animation_vector_drawable_grouping_1_path_motion.xml"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/animation_vector_drawable_grouping_1_path_motion_object.xml"
-            line="17"
-            column="2"/>
+            file="src/main/res/drawable/animation_vector_drawable_grouping_1_path_motion_object.xml"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/animation_vector_drawable_grouping_accelerate.xml"
-            line="17"
-            column="2"/>
+            file="src/main/res/drawable/animation_vector_drawable_grouping_accelerate.xml"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/animation_vector_drawable_grouping_decelerate.xml"
-            line="16"
-            column="2"/>
+            file="src/main/res/drawable/animation_vector_drawable_grouping_decelerate.xml"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/animation_vector_progress_bar.xml"
-            line="16"
-            column="2"/>
+            file="src/main/res/drawable/animation_vector_progress_bar.xml"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="&lt;animated-vector xmlns:aapt=&quot;http://schemas.android.com/aapt&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/btn_radio_on_to_off_bundle.xml"
-            line="16"
-            column="2"/>
+            file="src/main/res/drawable/btn_radio_on_to_off_bundle.xml"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/ic_hourglass_animation.xml"
-            line="15"
-            column="2"/>
+            file="src/main/res/drawable/ic_hourglass_animation.xml"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="&lt;animated-vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2=" ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/ic_signal_airplane_v2_animation.xml"
-            line="15"
-            column="2"/>
+            file="src/main/res/drawable/ic_signal_airplane_v2_animation.xml"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                        android:fillColor=&quot;?android:attr/colorForeground&quot;"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/vector_drawable23.xml"
-            line="74"
-            column="25"/>
+            file="src/main/res/drawable/vector_drawable23.xml"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="                        android:strokeColor=&quot;?android:attr/colorForeground&quot;"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/vector_drawable23.xml"
-            line="75"
-            column="25"/>
+            file="src/main/res/drawable/vector_drawable23.xml"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="                        android:fillColor=&quot;?android:attr/colorForeground&quot;"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/vector_drawable24.xml"
-            line="74"
-            column="25"/>
+            file="src/main/res/drawable/vector_drawable24.xml"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                        android:strokeColor=&quot;?android:attr/colorForeground&quot;"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/vector_drawable24.xml"
-            line="75"
-            column="25"/>
+            file="src/main/res/drawable/vector_drawable24.xml"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                M 3.65, 6.125"
         errorLine2="          ~~~~~">
         <location
-            file="src/main/res/drawable/vector_drawable04.xml"
-            line="26"
-            column="11"/>
+            file="src/main/res/drawable/vector_drawable04.xml"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                m-.001, 0"
         errorLine2="       ~~~~">
         <location
-            file="src/main/res/drawable/vector_drawable04.xml"
-            line="27"
-            column="8"/>
+            file="src/main/res/drawable/vector_drawable04.xml"/>
     </issue>
 
     <issue
diff --git a/vectordrawable/vectordrawable-animated/lint-baseline.xml b/vectordrawable/vectordrawable-animated/lint-baseline.xml
index d6618dd..ed73a301 100644
--- a/vectordrawable/vectordrawable-animated/lint-baseline.xml
+++ b/vectordrawable/vectordrawable-animated/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        return dr.unregisterAnimationCallback(callback.getPlatformCallback());"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="759"
-            column="19"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        avd.registerAnimationCallback(callback.getPlatformCallback());"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="822"
-            column="13"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            ((AnimatedVectorDrawable) mDelegateDrawable).clearAnimationCallbacks();"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="860"
-            column="58"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            ((AnimatedVectorDrawable) dr).clearAnimationCallbacks();"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="926"
-            column="43"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        public void onAnimationStart(Drawable drawable) {};"
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/Animatable2Compat.java"
-            line="63"
-            column="38"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/Animatable2Compat.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        public void onAnimationEnd(Drawable drawable) {};"
         errorLine2="                                   ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/Animatable2Compat.java"
-            line="69"
-            column="36"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/Animatable2Compat.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public Drawable mutate() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="194"
-            column="12"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public static AnimatedVectorDrawableCompat createFromXmlInner(Context context, Resources r,"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="252"
-            column="19"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public static AnimatedVectorDrawableCompat createFromXmlInner(Context context, Resources r,"
         errorLine2="                                                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="252"
-            column="67"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public static AnimatedVectorDrawableCompat createFromXmlInner(Context context, Resources r,"
         errorLine2="                                                                                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="252"
-            column="84"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="            XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="253"
-            column="13"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="            XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="253"
-            column="35"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="            XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                                                      ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="253"
-            column="55"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public ConstantState getConstantState() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="266"
-            column="12"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public void draw(Canvas canvas) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="285"
-            column="22"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    protected void onBoundsChange(Rect bounds) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="297"
-            column="35"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    protected boolean onStateChange(int[] state) {"
         errorLine2="                                    ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="306"
-            column="37"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public void setColorFilter(ColorFilter colorFilter) {"
         errorLine2="                               ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="339"
-            column="32"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public ColorFilter getColorFilter() {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="348"
-            column="12"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public void setTintList(ColorStateList tint) {"
         errorLine2="                            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="366"
-            column="29"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public void setTintMode(PorterDuff.Mode tintMode) {"
         errorLine2="                            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="376"
-            column="29"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="446"
-            column="25"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="446"
-            column="40"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="446"
-            column="62"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                                                                                 ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="446"
-            column="82"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs)"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="517"
-            column="25"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs)"
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="517"
-            column="40"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs)"
         errorLine2="                                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="517"
-            column="62"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    public void applyTheme(Theme t) {"
         errorLine2="                           ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="523"
-            column="28"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    public static void registerAnimationCallback(Drawable dr,"
         errorLine2="                                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="877"
-            column="50"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="            Animatable2Compat.AnimationCallback callback) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="878"
-            column="13"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    public static boolean unregisterAnimationCallback(Drawable dr,"
         errorLine2="                                                      ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="899"
-            column="55"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="            Animatable2Compat.AnimationCallback callback) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="900"
-            column="13"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public static void clearAnimationCallbacks(Drawable dr) {"
         errorLine2="                                               ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"
-            line="921"
-            column="48"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    public static Interpolator loadInterpolator(Context context, int id)"
         errorLine2="                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat.java"
-            line="62"
-            column="19"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    public static Interpolator loadInterpolator(Context context, int id)"
         errorLine2="                                                ~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat.java"
-            line="62"
-            column="49"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimationUtilsCompat.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, @AnimatorRes int id)"
         errorLine2="                  ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="92"
-            column="19"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, @AnimatorRes int id)"
         errorLine2="                                        ~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="92"
-            column="41"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, Resources resources, Theme theme,"
         errorLine2="                  ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="114"
-            column="19"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, Resources resources, Theme theme,"
         errorLine2="                                        ~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="114"
-            column="41"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, Resources resources, Theme theme,"
         errorLine2="                                                         ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="114"
-            column="58"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, Resources resources, Theme theme,"
         errorLine2="                                                                              ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="114"
-            column="79"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, Resources resources, Theme theme,"
         errorLine2="                  ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="122"
-            column="19"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -480,9 +394,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, Resources resources, Theme theme,"
         errorLine2="                                        ~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="122"
-            column="41"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -491,9 +403,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, Resources resources, Theme theme,"
         errorLine2="                                                         ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="122"
-            column="58"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -502,9 +412,7 @@
         errorLine1="    public static Animator loadAnimator(Context context, Resources resources, Theme theme,"
         errorLine2="                                                                              ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"
-            line="122"
-            column="79"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java"/>
     </issue>
 
     <issue
@@ -513,9 +421,7 @@
         errorLine1="    public static ArgbEvaluator getInstance() {"
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.java"
-            line="42"
-            column="19"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.java"/>
     </issue>
 
     <issue
@@ -524,9 +430,7 @@
         errorLine1="    public Object evaluate(float fraction, Object startValue, Object endValue) {"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.java"
-            line="63"
-            column="12"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.java"/>
     </issue>
 
     <issue
@@ -535,9 +439,7 @@
         errorLine1="    public Object evaluate(float fraction, Object startValue, Object endValue) {"
         errorLine2="                                           ~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.java"
-            line="63"
-            column="44"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.java"/>
     </issue>
 
     <issue
@@ -546,9 +448,7 @@
         errorLine1="    public Object evaluate(float fraction, Object startValue, Object endValue) {"
         errorLine2="                                                              ~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.java"
-            line="63"
-            column="63"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/ArgbEvaluator.java"/>
     </issue>
 
     <issue
@@ -557,9 +457,7 @@
         errorLine1="    public PathInterpolatorCompat(Context context, AttributeSet attrs, XmlPullParser parser) {"
         errorLine2="                                  ~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"
-            line="67"
-            column="35"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"/>
     </issue>
 
     <issue
@@ -568,9 +466,7 @@
         errorLine1="    public PathInterpolatorCompat(Context context, AttributeSet attrs, XmlPullParser parser) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"
-            line="67"
-            column="52"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"/>
     </issue>
 
     <issue
@@ -579,9 +475,7 @@
         errorLine1="    public PathInterpolatorCompat(Context context, AttributeSet attrs, XmlPullParser parser) {"
         errorLine2="                                                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"
-            line="67"
-            column="72"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"/>
     </issue>
 
     <issue
@@ -590,9 +484,7 @@
         errorLine1="    public PathInterpolatorCompat(Resources res, Resources.Theme theme, AttributeSet attrs,"
         errorLine2="                                  ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"
-            line="71"
-            column="35"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"/>
     </issue>
 
     <issue
@@ -601,9 +493,7 @@
         errorLine1="    public PathInterpolatorCompat(Resources res, Resources.Theme theme, AttributeSet attrs,"
         errorLine2="                                                 ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"
-            line="71"
-            column="50"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"/>
     </issue>
 
     <issue
@@ -612,9 +502,7 @@
         errorLine1="    public PathInterpolatorCompat(Resources res, Resources.Theme theme, AttributeSet attrs,"
         errorLine2="                                                                        ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"
-            line="71"
-            column="73"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"/>
     </issue>
 
     <issue
@@ -623,9 +511,7 @@
         errorLine1="            XmlPullParser parser) {"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"
-            line="72"
-            column="13"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java"/>
     </issue>
 
 </issues>
diff --git a/vectordrawable/vectordrawable/lint-baseline.xml b/vectordrawable/vectordrawable/lint-baseline.xml
index 14c378e..5ca9fec8 100644
--- a/vectordrawable/vectordrawable/lint-baseline.xml
+++ b/vectordrawable/vectordrawable/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    static final int STYLEABLE_ANIMATED_VECTOR_DRAWABLE_TARGET_ANIMATION = 1;"
         errorLine2="                                                                           ~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/AndroidResources.java"
-            line="87"
-            column="76"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/AndroidResources.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void scheduleSelf(Runnable what, long when) {"
         errorLine2="                                            ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="944"
-            column="45"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public Drawable mutate() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="329"
-            column="12"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    public ConstantState getConstantState() {"
         errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="347"
-            column="12"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void draw(Canvas canvas) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="357"
-            column="22"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    public void setColorFilter(ColorFilter colorFilter) {"
         errorLine2="                               ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="451"
-            column="32"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    public ColorFilter getColorFilter() {"
         errorLine2="           ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="462"
-            column="12"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public void setTintList(ColorStateList tint) {"
         errorLine2="                            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="495"
-            column="29"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public void setTintMode(Mode tintMode) {"
         errorLine2="                            ~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="510"
-            column="29"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    protected boolean onStateChange(int[] stateSet) {"
         errorLine2="                                    ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="536"
-            column="37"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public static VectorDrawableCompat createFromXmlInner(Resources r, XmlPullParser parser,"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="682"
-            column="19"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public static VectorDrawableCompat createFromXmlInner(Resources r, XmlPullParser parser,"
         errorLine2="                                                          ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="682"
-            column="59"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public static VectorDrawableCompat createFromXmlInner(Resources r, XmlPullParser parser,"
         errorLine2="                                                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="682"
-            column="72"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="            AttributeSet attrs, Theme theme) throws XmlPullParserException, IOException {"
         errorLine2="            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="683"
-            column="13"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="            AttributeSet attrs, Theme theme) throws XmlPullParserException, IOException {"
         errorLine2="                                ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="683"
-            column="33"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs)"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="697"
-            column="25"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs)"
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="697"
-            column="40"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs)"
         errorLine2="                                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="697"
-            column="62"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                        ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="708"
-            column="25"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="708"
-            column="40"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                                                             ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="708"
-            column="62"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)"
         errorLine2="                                                                                 ~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="708"
-            column="82"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    protected void onBoundsChange(Rect bounds) {"
         errorLine2="                                  ~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="920"
-            column="35"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    public void scheduleSelf(Runnable what, long when) {"
         errorLine2="                             ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="944"
-            column="30"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    public void unscheduleSelf(Runnable what) {"
         errorLine2="                               ~~~~~~~~">
         <location
-            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"
-            line="961"
-            column="32"/>
+            file="src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java"/>
     </issue>
 
 </issues>
diff --git a/versionedparcelable/versionedparcelable-compiler/lint-baseline.xml b/versionedparcelable/versionedparcelable-compiler/lint-baseline.xml
index c8d53ee..2798d27 100644
--- a/versionedparcelable/versionedparcelable-compiler/lint-baseline.xml
+++ b/versionedparcelable/versionedparcelable-compiler/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    @Override"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/versionedparcelable/compiler/VersionedParcelProcessor.java"
-            line="85"
-            column="5"/>
+            file="src/main/java/androidx/versionedparcelable/compiler/VersionedParcelProcessor.java"/>
     </issue>
 
 </issues>
diff --git a/versionedparcelable/versionedparcelable/lint-baseline.xml b/versionedparcelable/versionedparcelable/lint-baseline.xml
index 43aa25a..63ec5bb 100644
--- a/versionedparcelable/versionedparcelable/lint-baseline.xml
+++ b/versionedparcelable/versionedparcelable/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            return (T) m.invoke(null, versionedParcel);"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/versionedparcelable/VersionedParcel.java"
-            line="1598"
-            column="24"/>
+            file="src/main/java/androidx/versionedparcelable/VersionedParcel.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            m.invoke(null, val, versionedParcel);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/versionedparcelable/VersionedParcel.java"
-            line="1625"
-            column="13"/>
+            file="src/main/java/androidx/versionedparcelable/VersionedParcel.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public void writeStrongInterface(@Nullable IInterface val, int fieldId) {"
         errorLine2="                                                               ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/versionedparcelable/VersionedParcel.java"
-            line="291"
-            column="64"/>
+            file="src/main/java/androidx/versionedparcelable/VersionedParcel.java"/>
     </issue>
 
 </issues>
diff --git a/viewpager/viewpager/lint-baseline.xml b/viewpager/viewpager/lint-baseline.xml
index 2624eff..ff70f907 100644
--- a/viewpager/viewpager/lint-baseline.xml
+++ b/viewpager/viewpager/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            @Nullable PageTransformer transformer, int pageLayerType) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="799"
-            column="52"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public void setBackgroundDrawable(Drawable d) {"
         errorLine2="                                      ~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"
-            line="172"
-            column="39"/>
+            file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    public boolean onTouchEvent(MotionEvent ev) {"
         errorLine2="                                ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"
-            line="224"
-            column="33"/>
+            file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    protected void onDraw(Canvas canvas) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"
-            line="261"
-            column="27"/>
+            file="src/main/java/androidx/viewpager/widget/PagerTabStrip.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    public void setOnPageChangeListener(OnPageChangeListener listener) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="721"
-            column="41"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    protected boolean verifyDrawable(Drawable who) {"
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="922"
-            column="38"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        public void writeToParcel(Parcel out, int flags) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="1400"
-            column="35"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    public Parcelable onSaveInstanceState() {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="1441"
-            column="12"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    public void onRestoreInstanceState(Parcelable state) {"
         errorLine2="                                       ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="1452"
-            column="40"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    public void addView(View child, int index, ViewGroup.LayoutParams params) {"
         errorLine2="                        ~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="1472"
-            column="25"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    public void addView(View child, int index, ViewGroup.LayoutParams params) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="1472"
-            column="48"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    public void removeView(View view) {"
         errorLine2="                           ~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="1496"
-            column="28"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="    public boolean onInterceptTouchEvent(MotionEvent ev) {"
         errorLine2="                                         ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="2038"
-            column="42"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="    public boolean onTouchEvent(MotionEvent ev) {"
         errorLine2="                                ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="2191"
-            column="33"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="    public void draw(Canvas canvas) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="2491"
-            column="22"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="    protected void onDraw(Canvas canvas) {"
         errorLine2="                          ~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="2533"
-            column="27"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="    protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {"
         errorLine2="                                ~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="2775"
-            column="33"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="    public boolean dispatchKeyEvent(KeyEvent event) {"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="2799"
-            column="37"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    public void addFocusables(ArrayList&lt;View> views, int direction, int focusableMode) {"
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="2961"
-            column="31"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public void addTouchables(ArrayList&lt;View> views) {"
         errorLine2="                              ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="3003"
-            column="31"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="            Rect previouslyFocusedRect) {"
         errorLine2="            ~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="3023"
-            column="13"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="3052"
-            column="55"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    protected ViewGroup.LayoutParams generateDefaultLayoutParams() {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="3075"
-            column="15"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="3080"
-            column="15"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="3080"
-            column="59"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="3085"
-            column="41"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    public ViewGroup.LayoutParams generateLayoutParams(AttributeSet attrs) {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager/widget/ViewPager.java"
-            line="3090"
-            column="12"/>
+            file="src/main/java/androidx/viewpager/widget/ViewPager.java"/>
     </issue>
 
     <issue
diff --git a/viewpager2/integration-tests/testapp/lint-baseline.xml b/viewpager2/integration-tests/testapp/lint-baseline.xml
index ebd9ff2..c43cebf 100644
--- a/viewpager2/integration-tests/testapp/lint-baseline.xml
+++ b/viewpager2/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                throw AssertionError(&quot;Block hit bad state $n times&quot;, e)"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/viewpager2/integration/testapp/test/util/RetryBlock.kt"
-            line="50"
-            column="23"/>
+            file="src/androidTest/java/androidx/viewpager2/integration/testapp/test/util/RetryBlock.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                        textDirection = View.TEXT_DIRECTION_LOCALE"
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager2/integration/testapp/MutableCollectionBaseActivity.kt"
-            line="65"
-            column="25"/>
+            file="src/main/java/androidx/viewpager2/integration/testapp/MutableCollectionBaseActivity.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                        textDirection = View.TEXT_DIRECTION_LOCALE"
         errorLine2="                        ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager2/integration/testapp/MutableCollectionBaseActivity.kt"
-            line="65"
-            column="25"/>
+            file="src/main/java/androidx/viewpager2/integration/testapp/MutableCollectionBaseActivity.kt"/>
     </issue>
 
 </issues>
diff --git a/viewpager2/viewpager2/lint-baseline.xml b/viewpager2/viewpager2/lint-baseline.xml
index 1a6692b..1de0138 100644
--- a/viewpager2/viewpager2/lint-baseline.xml
+++ b/viewpager2/viewpager2/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                throw AssertionError(&quot;Block hit bad state $n times&quot;, e)"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"
-            line="737"
-            column="23"/>
+            file="src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                v.setHasTransientState(true)"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/viewpager2/widget/TransientStateFragmentTest.kt"
-            line="76"
-            column="19"/>
+            file="src/androidTest/java/androidx/viewpager2/widget/TransientStateFragmentTest.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        return mLayoutManager.getOrientation();"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="582"
-            column="16"/>
+            file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        super(context, attrs, defStyleAttr, defStyleRes);"
         errorLine2="        ~~~~~">
         <location
-            file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="183"
-            column="9"/>
+            file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            super(source, loader);"
         errorLine2="            ~~~~~">
         <location
-            file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"
-            line="393"
-            column="13"/>
+            file="src/main/java/androidx/viewpager2/widget/ViewPager2.java"/>
     </issue>
 
 </issues>
diff --git a/wear/tiles/tiles-material/lint-baseline.xml b/wear/tiles/tiles-material/lint-baseline.xml
index 5e037ec..6040670 100644
--- a/wear/tiles/tiles-material/lint-baseline.xml
+++ b/wear/tiles/tiles-material/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            mSize = dp(size);"
         errorLine2="                       ~~~~">
         <location
-            file="src/main/java/androidx/wear/tiles/material/Button.java"
-            line="147"
-            column="24"/>
+            file="src/main/java/androidx/wear/tiles/material/Button.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        return recommendedIconSize(buttonSize.getValue());"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/tiles/material/ButtonDefaults.java"
-            line="46"
-            column="36"/>
+            file="src/main/java/androidx/wear/tiles/material/ButtonDefaults.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            mWidth = dp(width);"
         errorLine2="                        ~~~~~">
         <location
-            file="src/main/java/androidx/wear/tiles/material/Chip.java"
-            line="152"
-            column="25"/>
+            file="src/main/java/androidx/wear/tiles/material/Chip.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            this.mStrokeWidth = dp(strokeWidth);"
         errorLine2="                                   ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java"
-            line="160"
-            column="36"/>
+            file="src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="            this.mHorizontalSpacerWidth = dp(width);"
         errorLine2="                                             ~~~~~">
         <location
-            file="src/main/java/androidx/wear/tiles/material/layouts/MultiSlotLayout.java"
-            line="134"
-            column="46"/>
+            file="src/main/java/androidx/wear/tiles/material/layouts/MultiSlotLayout.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="            this.mVerticalSpacerHeight = dp(height);"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/wear/tiles/material/layouts/MultiSlotLayout.java"
-            line="149"
-            column="45"/>
+            file="src/main/java/androidx/wear/tiles/material/layouts/MultiSlotLayout.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="            mWidth = dp(width);"
         errorLine2="                        ~~~~~">
         <location
-            file="src/main/java/androidx/wear/tiles/material/TitleChip.java"
-            line="126"
-            column="25"/>
+            file="src/main/java/androidx/wear/tiles/material/TitleChip.java"/>
     </issue>
 
 </issues>
diff --git a/wear/watchface/watchface-client-guava/lint-baseline.xml b/wear/watchface/watchface-client-guava/lint-baseline.xml
index 98e8046..da107d2 100644
--- a/wear/watchface/watchface-client-guava/lint-baseline.xml
+++ b/wear/watchface/watchface-client-guava/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    private val realService = object : WatchFaceControlService() {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/client/guava/ListenableWatchFaceMetadataClientTest.kt"
-            line="47"
-            column="31"/>
+            file="src/androidTest/java/androidx/wear/watchface/client/guava/ListenableWatchFaceMetadataClientTest.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    private val realService = object : WatchFaceControlService() {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/client/guava/ListenableWatchFaceMetadataClientTest.kt"
-            line="47"
-            column="40"/>
+            file="src/androidTest/java/androidx/wear/watchface/client/guava/ListenableWatchFaceMetadataClientTest.kt"/>
     </issue>
 
 </issues>
diff --git a/wear/watchface/watchface-client/lint-baseline.xml b/wear/watchface/watchface-client/lint-baseline.xml
index 9d79bbb..99afe84 100644
--- a/wear/watchface/watchface-client/lint-baseline.xml
+++ b/wear/watchface/watchface-client/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    private val realService = object : WatchFaceControlService() {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlTestService.kt"
-            line="43"
-            column="31"/>
+            file="src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlTestService.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    private val realService = object : WatchFaceControlService() {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlTestService.kt"
-            line="43"
-            column="40"/>
+            file="src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlTestService.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            object : IWatchFaceInstanceServiceStub("
         errorLine2="            ^">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlTestService.kt"
-            line="45"
-            column="13"/>
+            file="src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlTestService.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            object : IWatchFaceInstanceServiceStub("
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlTestService.kt"
-            line="45"
-            column="22"/>
+            file="src/androidTest/java/androidx/wear/watchface/client/test/WatchFaceControlTestService.kt"/>
     </issue>
 
 </issues>
diff --git a/wear/watchface/watchface-complications-data/lint-baseline.xml b/wear/watchface/watchface-complications-data/lint-baseline.xml
index 6667ef6..5e94cbd 100644
--- a/wear/watchface/watchface-complications-data/lint-baseline.xml
+++ b/wear/watchface/watchface-complications-data/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_short_days&quot; formatted=&quot;false&quot; msgid=&quot;3878057769320887026&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/complication_strings.xml"
-            line="4"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_short_days&quot; formatted=&quot;false&quot; msgid=&quot;3878057769320887026&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/complication_strings.xml"
-            line="4"
-            column="5"/>
+            file="src/main/res/values-fr/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_short_hours&quot; formatted=&quot;false&quot; msgid=&quot;6016687406802669982&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/complication_strings.xml"
-            line="8"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_short_hours&quot; formatted=&quot;false&quot; msgid=&quot;6016687406802669982&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/complication_strings.xml"
-            line="8"
-            column="5"/>
+            file="src/main/res/values-fr/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_short_minutes&quot; formatted=&quot;false&quot; msgid=&quot;6752732458902810711&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/complication_strings.xml"
-            line="12"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_short_minutes&quot; formatted=&quot;false&quot; msgid=&quot;6752732458902810711&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/complication_strings.xml"
-            line="12"
-            column="5"/>
+            file="src/main/res/values-fr/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_words_days&quot; formatted=&quot;false&quot; msgid=&quot;5109682345086392533&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/complication_strings.xml"
-            line="18"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_words_days&quot; formatted=&quot;false&quot; msgid=&quot;5109682345086392533&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/complication_strings.xml"
-            line="18"
-            column="5"/>
+            file="src/main/res/values-fr/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_words_hours&quot; formatted=&quot;false&quot; msgid=&quot;3172220157267000186&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/complication_strings.xml"
-            line="22"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_words_hours&quot; formatted=&quot;false&quot; msgid=&quot;3172220157267000186&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/complication_strings.xml"
-            line="22"
-            column="5"/>
+            file="src/main/res/values-fr/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_words_minutes&quot; formatted=&quot;false&quot; msgid=&quot;529404827937478243&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr-rCA/complication_strings.xml"
-            line="26"
-            column="5"/>
+            file="src/main/res/values-fr-rCA/complication_strings.xml"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="    &lt;plurals name=&quot;time_difference_words_minutes&quot; formatted=&quot;false&quot; msgid=&quot;529404827937478243&quot;>"
         errorLine2="    ^">
         <location
-            file="src/main/res/values-fr/complication_strings.xml"
-            line="26"
-            column="5"/>
+            file="src/main/res/values-fr/complication_strings.xml"/>
     </issue>
 
 </issues>
diff --git a/wear/watchface/watchface-guava/lint-baseline.xml b/wear/watchface/watchface-guava/lint-baseline.xml
index 66387be..fca58a1 100644
--- a/wear/watchface/watchface-guava/lint-baseline.xml
+++ b/wear/watchface/watchface-guava/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    private val realService = object : WatchFaceControlService() {"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt"
-            line="62"
-            column="31"/>
+            file="src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    private val realService = object : WatchFaceControlService() {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt"
-            line="62"
-            column="40"/>
+            file="src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            object : IWatchFaceInstanceServiceStub("
         errorLine2="            ^">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt"
-            line="64"
-            column="13"/>
+            file="src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="            object : IWatchFaceInstanceServiceStub("
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt"
-            line="64"
-            column="22"/>
+            file="src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt"/>
     </issue>
 
 </issues>
diff --git a/wear/watchface/watchface/lint-baseline.xml b/wear/watchface/watchface/lint-baseline.xml
index d7b0445..c17162a 100644
--- a/wear/watchface/watchface/lint-baseline.xml
+++ b/wear/watchface/watchface/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        HeadlessWatchFaceImpl.dump(indentingPrintWriter)"
         errorLine2="                              ~~~~">
         <location
-            file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"
-            line="2295"
-            column="31"/>
+            file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        complicationSlotsManager.addTapListener("
         errorLine2="        ^">
         <location
-            file="src/test/java/androidx/wear/watchface/TestCommon.kt"
-            line="101"
-            column="9"/>
+            file="src/test/java/androidx/wear/watchface/TestCommon.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="            complicationSlotsManager.watchState,"
         errorLine2="                                     ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/watchface/ComplicationSlot.kt"
-            line="271"
-            column="38"/>
+            file="src/main/java/androidx/wear/watchface/ComplicationSlot.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                            if (engine.deferredWatchFaceImpl.isCompleted) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/watchface/control/InteractiveInstanceManager.kt"
-            line="125"
-            column="40"/>
+            file="src/main/java/androidx/wear/watchface/control/InteractiveInstanceManager.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                    it.deferredWatchFaceImpl.await()"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/watchface/control/InteractiveWatchFaceImpl.kt"
-            line="119"
-            column="24"/>
+            file="src/main/java/androidx/wear/watchface/control/InteractiveWatchFaceImpl.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                return engine.deferredWatchFaceImpl.await().WFEditorDelegate()"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/watchface/WatchFace.kt"
-            line="214"
-            column="31"/>
+            file="src/main/java/androidx/wear/watchface/WatchFace.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                return engine.deferredWatchFaceImpl.await().WFEditorDelegate()"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/watchface/WatchFace.kt"
-            line="214"
-            column="31"/>
+            file="src/main/java/androidx/wear/watchface/WatchFace.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                complicationSlotsManager.watchState = watchState"
         errorLine2="                                         ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"
-            line="1761"
-            column="42"/>
+            file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"/>
     </issue>
 
 </issues>
diff --git a/wear/wear-ongoing/lint-baseline.xml b/wear/wear-ongoing/lint-baseline.xml
index 9dee9f1..bbb03df 100644
--- a/wear/wear-ongoing/lint-baseline.xml
+++ b/wear/wear-ongoing/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        assertEquals(StaticIconResourceId, received.staticIcon.resId)"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="65"
-            column="64"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="        assertEquals(AnimatedIconResourceId, received.animatedIcon!!.resId)"
         errorLine2="                                                                     ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="92"
-            column="70"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="        assertEquals(StaticIconResourceId, received.staticIcon.resId)"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="93"
-            column="64"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="        assertEquals(AnimatedIconResourceId, received.animatedIcon!!.resId)"
         errorLine2="                                                                     ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="131"
-            column="70"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        assertEquals(StaticIconResourceId, received.staticIcon.resId)"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="132"
-            column="64"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        assertEquals(AnimatedIconResourceId, received.animatedIcon!!.resId)"
         errorLine2="                                                                     ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="218"
-            column="70"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="        assertEquals(StaticIconResourceId, received.staticIcon.resId)"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="219"
-            column="64"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="        assertEquals(AnimatedIconResourceId, received.animatedIcon!!.resId)"
         errorLine2="                                                                     ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="255"
-            column="70"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="        assertEquals(StaticIconResourceId, received.staticIcon.resId)"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="256"
-            column="64"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="        assertEquals(StaticIconResourceId, received.staticIcon.resId)"
         errorLine2="                                                               ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="283"
-            column="64"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="        assertEquals(newAnimatedIconResourceId, received.animatedIcon!!.resId)"
         errorLine2="                                                                        ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="316"
-            column="73"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="        assertEquals(newStaticIconResourceId, received.staticIcon.resId)"
         errorLine2="                                                                  ~~~~~">
         <location
-            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"
-            line="317"
-            column="67"/>
+            file="src/test/java/androidx/wear/ongoing/OngoingActivityTest.kt"/>
     </issue>
 
 </issues>
diff --git a/wear/wear/lint-baseline.xml b/wear/wear/lint-baseline.xml
index 50346ac..96f919c 100644
--- a/wear/wear/lint-baseline.xml
+++ b/wear/wear/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public int getDefaultCircleColor() {"
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/widget/CircledImageView.java"
-            line="544"
-            column="16"/>
+            file="src/main/java/androidx/wear/widget/CircledImageView.java"/>
     </issue>
 
     <issue
@@ -18,13 +16,9 @@
         errorLine1="    public int[] getColorSchemeColors() {"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/widget/CircularProgressLayout.java"
-            line="348"
-            column="18"/>
+            file="src/main/java/androidx/wear/widget/CircularProgressLayout.java"/>
         <location
             file="src/main/java/androidx/wear/widget/CircularProgressLayout.java"
-            line="339"
-            column="17"
             message="Setter here"/>
     </issue>
 
@@ -34,13 +28,9 @@
         errorLine1="    public float getDotSpacing() {"
         errorLine2="                 ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"
-            line="208"
-            column="18"/>
+            file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"/>
         <location
             file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"
-            line="217"
-            column="17"
             message="Setter here"/>
     </issue>
 
@@ -50,13 +40,9 @@
         errorLine1="    public float getDotRadius() {"
         errorLine2="                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"
-            line="229"
-            column="18"/>
+            file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"/>
         <location
             file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"
-            line="238"
-            column="17"
             message="Setter here"/>
     </issue>
 
@@ -66,13 +52,9 @@
         errorLine1="    public float getDotRadiusSelected() {"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"
-            line="251"
-            column="18"/>
+            file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"/>
         <location
             file="src/main/java/androidx/wear/widget/drawer/PageIndicatorView.java"
-            line="260"
-            column="17"
             message="Setter here"/>
     </issue>
 
@@ -82,9 +64,7 @@
         errorLine1="    public void setIsAutoPeekEnabled(boolean canAutoPeek) {"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/widget/drawer/WearableDrawerView.java"
-            line="394"
-            column="17"/>
+            file="src/main/java/androidx/wear/widget/drawer/WearableDrawerView.java"/>
     </issue>
 
     <issue
@@ -93,9 +73,7 @@
         errorLine1="    public void setIsLocked(boolean locked) {"
         errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/widget/drawer/WearableDrawerView.java"
-            line="413"
-            column="17"/>
+            file="src/main/java/androidx/wear/widget/drawer/WearableDrawerView.java"/>
     </issue>
 
     <issue
@@ -104,9 +82,7 @@
         errorLine1="        AmbientCallback getAmbientCallback();"
         errorLine2="        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="100"
-            column="9"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -115,9 +91,7 @@
         errorLine1="        public void onEnterAmbient(Bundle ambientDetails) {}"
         errorLine2="                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="116"
-            column="36"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -126,9 +100,7 @@
         errorLine1="    public void onAttach(Context context) {"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="181"
-            column="26"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -137,9 +109,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="194"
-            column="26"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -148,9 +118,7 @@
         errorLine1="    public static &lt;T extends Activity> AmbientController attachAmbientSupport(T activity) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="250"
-            column="40"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -159,9 +127,7 @@
         errorLine1="    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="265"
-            column="22"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -170,9 +136,7 @@
         errorLine1="    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {"
         errorLine2="                                    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="265"
-            column="37"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -181,9 +145,7 @@
         errorLine1="    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {"
         errorLine2="                                                       ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="265"
-            column="56"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -192,9 +154,7 @@
         errorLine1="    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {"
         errorLine2="                                                                           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientMode.java"
-            line="265"
-            column="76"/>
+            file="src/main/java/androidx/wear/ambient/AmbientMode.java"/>
     </issue>
 
     <issue
@@ -203,9 +163,7 @@
         errorLine1="        AmbientCallback getAmbientCallback();"
         errorLine2="        ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"
-            line="127"
-            column="9"/>
+            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"/>
     </issue>
 
     <issue
@@ -214,9 +172,7 @@
         errorLine1="        public void onEnterAmbient(Bundle ambientDetails) {}"
         errorLine2="                                   ~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"
-            line="144"
-            column="36"/>
+            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"/>
     </issue>
 
     <issue
@@ -225,9 +181,7 @@
         errorLine1="    public void onAttach(Context context) {"
         errorLine2="                         ~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"
-            line="211"
-            column="26"/>
+            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"/>
     </issue>
 
     <issue
@@ -236,9 +190,7 @@
         errorLine1="    public void onCreate(Bundle savedInstanceState) {"
         errorLine2="                         ~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"
-            line="224"
-            column="26"/>
+            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"/>
     </issue>
 
     <issue
@@ -247,9 +199,7 @@
         errorLine1="    public static &lt;T extends FragmentActivity> AmbientController attach(T activity) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"
-            line="280"
-            column="48"/>
+            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"/>
     </issue>
 
     <issue
@@ -258,9 +208,7 @@
         errorLine1="    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"
-            line="296"
-            column="22"/>
+            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"/>
     </issue>
 
     <issue
@@ -269,9 +217,7 @@
         errorLine1="    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {"
         errorLine2="                                    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"
-            line="296"
-            column="37"/>
+            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"/>
     </issue>
 
     <issue
@@ -280,9 +226,7 @@
         errorLine1="    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {"
         errorLine2="                                                       ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"
-            line="296"
-            column="56"/>
+            file="src/main/java/androidx/wear/ambient/AmbientModeSupport.java"/>
     </issue>
 
     <issue
diff --git a/webkit/webkit/lint-baseline.xml b/webkit/webkit/lint-baseline.xml
index b05b3c9d..9f0f85f 100644
--- a/webkit/webkit/lint-baseline.xml
+++ b/webkit/webkit/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            ApiHelperForQ.setForceDark(settings, forceDarkMode);"
         errorLine2="                          ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/webkit/WebSettingsCompat.java"
-            line="361"
-            column="27"/>
+            file="src/main/java/androidx/webkit/WebSettingsCompat.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            return ApiHelperForQ.getForceDark(settings);"
         errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/webkit/WebSettingsCompat.java"
-            line="390"
-            column="34"/>
+            file="src/main/java/androidx/webkit/WebSettingsCompat.java"/>
     </issue>
 
 </issues>
diff --git a/window/extensions/extensions/lint-baseline.xml b/window/extensions/extensions/lint-baseline.xml
index 2315859..9a822c3 100644
--- a/window/extensions/extensions/lint-baseline.xml
+++ b/window/extensions/extensions/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        mRootViewId = View.generateViewId();"
         errorLine2="                           ~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/window/extensions/TestActivity.java"
-            line="37"
-            column="28"/>
+            file="src/androidTest/java/androidx/window/extensions/TestActivity.java"/>
     </issue>
 
 </issues>
diff --git a/work/integration-tests/testapp/lint-baseline.xml b/work/integration-tests/testapp/lint-baseline.xml
index 88c61da..a86a1ea 100644
--- a/work/integration-tests/testapp/lint-baseline.xml
+++ b/work/integration-tests/testapp/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="                &amp;&amp; Build.VERSION.SDK_INT >= 16 &amp;&amp; data.getClipData() != null) {"
         errorLine2="                                                       ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"
-            line="95"
-            column="56"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="            int count = data.getClipData().getItemCount();"
         errorLine2="                             ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"
-            line="97"
-            column="30"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                String uriString = data.getClipData().getItemAt(i).getUri().toString();"
         errorLine2="                                        ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"
-            line="101"
-            column="41"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                    jobScheduler.cancelAll();"
         errorLine2="                                 ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"
-            line="560"
-            column="34"/>
+            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="                        jobScheduler.schedule("
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"
-            line="562"
-            column="38"/>
+            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="                                new JobInfo.Builder("
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"
-            line="563"
-            column="33"/>
+            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                                        .setMinimumLatency(10 * 60 * 1000)"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"
-            line="566"
-            column="42"/>
+            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="                                        .build());"
         errorLine2="                                         ~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"
-            line="567"
-            column="42"/>
+            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="                        mImageRecyclerViewAdapter.updateList(images);"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"
-            line="65"
-            column="25"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"/>
     </issue>
 
     <issue
@@ -106,9 +88,7 @@
         errorLine1="                        if (mShouldLoad) {"
         errorLine2="                            ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="78"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -117,9 +97,7 @@
         errorLine1="                            mImageView.setImageBitmap(bitmap);"
         errorLine2="                            ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="80"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -128,9 +106,7 @@
         errorLine1="                            mTextView.setText(image.mOriginalAssetName);"
         errorLine2="                            ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="81"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -139,9 +115,7 @@
         errorLine1="                            mProgressBar.setVisibility(View.GONE);"
         errorLine2="                            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="82"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -150,9 +124,7 @@
         errorLine1="                            mImageView.setVisibility(View.VISIBLE);"
         errorLine2="                            ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="83"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -161,9 +133,7 @@
         errorLine1="                scheduleWork(&quot;one&quot;, 3, 0.2);"
         errorLine2="                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/RetryActivity.java"
-            line="63"
-            column="17"/>
+            file="src/main/java/androidx/work/integration/testapp/RetryActivity.java"/>
     </issue>
 
     <issue
@@ -172,9 +142,7 @@
         errorLine1="                scheduleWork(&quot;two&quot;, 5, 0.5);"
         errorLine2="                ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/RetryActivity.java"
-            line="64"
-            column="17"/>
+            file="src/main/java/androidx/work/integration/testapp/RetryActivity.java"/>
     </issue>
 
     <issue
@@ -183,9 +151,7 @@
         errorLine1="                            mTextView.setText(&quot;nothing to show&quot;);"
         errorLine2="                            ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/RetryActivity.java"
-            line="79"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/RetryActivity.java"/>
     </issue>
 
     <issue
@@ -194,9 +160,7 @@
         errorLine1="                            mTextView.setText(text);"
         errorLine2="                            ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/RetryActivity.java"
-            line="81"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/RetryActivity.java"/>
     </issue>
 
     <issue
@@ -205,9 +169,7 @@
         errorLine1="    protected void onCreate(final Bundle savedInstanceState) {"
         errorLine2="                                  ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/sherlockholmes/AnalyzeSherlockHolmesActivity.java"
-            line="50"
-            column="35"/>
+            file="src/main/java/androidx/work/integration/testapp/sherlockholmes/AnalyzeSherlockHolmesActivity.java"/>
     </issue>
 
     <issue
@@ -216,9 +178,7 @@
         errorLine1="    public String mProcessedFilePath;"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/Image.java"
-            line="34"
-            column="12"/>
+            file="src/main/java/androidx/work/integration/testapp/db/Image.java"/>
     </issue>
 
     <issue
@@ -227,9 +187,7 @@
         errorLine1="    public Bitmap mImage;"
         errorLine2="           ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/Image.java"
-            line="39"
-            column="12"/>
+            file="src/main/java/androidx/work/integration/testapp/db/Image.java"/>
     </issue>
 
     <issue
@@ -238,9 +196,7 @@
         errorLine1="    void insert(Image image);"
         errorLine2="                ~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"
-            line="37"
-            column="17"/>
+            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"/>
     </issue>
 
     <issue
@@ -249,9 +205,7 @@
         errorLine1="    List&lt;Image> getImages();"
         errorLine2="    ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"
-            line="45"
-            column="5"/>
+            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"/>
     </issue>
 
     <issue
@@ -260,9 +214,7 @@
         errorLine1="    int setProcessed(String originalAssetName, String processedFilePath);"
         errorLine2="                     ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"
-            line="54"
-            column="22"/>
+            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"/>
     </issue>
 
     <issue
@@ -271,9 +223,7 @@
         errorLine1="    int setProcessed(String originalAssetName, String processedFilePath);"
         errorLine2="                                               ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"
-            line="54"
-            column="48"/>
+            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"/>
     </issue>
 
     <issue
@@ -282,9 +232,7 @@
         errorLine1="    LiveData&lt;List&lt;Image>> getImagesLiveData();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"
-            line="62"
-            column="5"/>
+            file="src/main/java/androidx/work/integration/testapp/db/ImageDao.java"/>
     </issue>
 
     <issue
@@ -293,9 +241,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"
-            line="49"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingActivity.java"/>
     </issue>
 
     <issue
@@ -304,9 +250,7 @@
         errorLine1="    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {"
         errorLine2="           ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="117"
-            column="12"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -315,9 +259,7 @@
         errorLine1="    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {"
         errorLine2="                                         ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="117"
-            column="42"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -326,9 +268,7 @@
         errorLine1="    public void onBindViewHolder(ViewHolder holder, int position) {"
         errorLine2="                                 ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="124"
-            column="34"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -337,9 +277,7 @@
         errorLine1="    public void onViewRecycled(ViewHolder holder) {"
         errorLine2="                               ~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"
-            line="129"
-            column="32"/>
+            file="src/main/java/androidx/work/integration/testapp/imageprocessing/ImageRecyclerViewAdapter.java"/>
     </issue>
 
     <issue
@@ -348,9 +286,7 @@
         errorLine1="    protected void onCreate(Bundle savedInstanceState) {"
         errorLine2="                            ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"
-            line="82"
-            column="29"/>
+            file="src/main/java/androidx/work/integration/testapp/MainActivity.java"/>
     </issue>
 
     <issue
@@ -359,9 +295,7 @@
         errorLine1="    public static String TAG = &quot;RecursiveWorker&quot;;"
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/RecursiveWorker.java"
-            line="34"
-            column="19"/>
+            file="src/main/java/androidx/work/integration/testapp/RecursiveWorker.java"/>
     </issue>
 
     <issue
@@ -370,9 +304,7 @@
         errorLine1="    public static TestDatabase getInstance(Context context) {"
         errorLine2="                  ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/TestDatabase.java"
-            line="38"
-            column="19"/>
+            file="src/main/java/androidx/work/integration/testapp/db/TestDatabase.java"/>
     </issue>
 
     <issue
@@ -381,9 +313,7 @@
         errorLine1="    public static TestDatabase getInstance(Context context) {"
         errorLine2="                                           ~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/TestDatabase.java"
-            line="38"
-            column="44"/>
+            file="src/main/java/androidx/work/integration/testapp/db/TestDatabase.java"/>
     </issue>
 
     <issue
@@ -392,9 +322,7 @@
         errorLine1="    public abstract WordCountDao getWordCountDao();"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/TestDatabase.java"
-            line="51"
-            column="21"/>
+            file="src/main/java/androidx/work/integration/testapp/db/TestDatabase.java"/>
     </issue>
 
     <issue
@@ -403,9 +331,7 @@
         errorLine1="    public abstract ImageDao getImageDao();"
         errorLine2="                    ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/TestDatabase.java"
-            line="58"
-            column="21"/>
+            file="src/main/java/androidx/work/integration/testapp/db/TestDatabase.java"/>
     </issue>
 
     <issue
@@ -414,9 +340,7 @@
         errorLine1="    public static OneTimeWorkRequest.Builder create(String inputFile) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/sherlockholmes/TextMappingWorker.java"
-            line="50"
-            column="19"/>
+            file="src/main/java/androidx/work/integration/testapp/sherlockholmes/TextMappingWorker.java"/>
     </issue>
 
     <issue
@@ -425,9 +349,7 @@
         errorLine1="    public static OneTimeWorkRequest.Builder create(String inputFile) {"
         errorLine2="                                                    ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/sherlockholmes/TextMappingWorker.java"
-            line="50"
-            column="53"/>
+            file="src/main/java/androidx/work/integration/testapp/sherlockholmes/TextMappingWorker.java"/>
     </issue>
 
     <issue
@@ -436,9 +358,7 @@
         errorLine1="    public static OneTimeWorkRequest.Builder create(String message) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/ToastWorker.java"
-            line="45"
-            column="19"/>
+            file="src/main/java/androidx/work/integration/testapp/ToastWorker.java"/>
     </issue>
 
     <issue
@@ -447,9 +367,7 @@
         errorLine1="    public static OneTimeWorkRequest.Builder create(String message) {"
         errorLine2="                                                    ~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/ToastWorker.java"
-            line="45"
-            column="53"/>
+            file="src/main/java/androidx/work/integration/testapp/ToastWorker.java"/>
     </issue>
 
     <issue
@@ -458,9 +376,7 @@
         errorLine1="    void insertWordCount(WordCount wordCount);"
         errorLine2="                         ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/WordCountDao.java"
-            line="37"
-            column="26"/>
+            file="src/main/java/androidx/work/integration/testapp/db/WordCountDao.java"/>
     </issue>
 
     <issue
@@ -469,9 +385,7 @@
         errorLine1="    LiveData&lt;List&lt;WordCount>> getWordCounts();"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/integration/testapp/db/WordCountDao.java"
-            line="45"
-            column="5"/>
+            file="src/main/java/androidx/work/integration/testapp/db/WordCountDao.java"/>
     </issue>
 
 </issues>
diff --git a/work/work-multiprocess/lint-baseline.xml b/work/work-multiprocess/lint-baseline.xml
index a3b0d79..5bfeb59 100644
--- a/work/work-multiprocess/lint-baseline.xml
+++ b/work/work-multiprocess/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public suspend fun setProgress(data: Data) {"
         errorLine2="                       ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/multiprocess/RemoteCoroutineWorker.kt"
-            line="90"
-            column="24"/>
+            file="src/main/java/androidx/work/multiprocess/RemoteCoroutineWorker.kt"/>
     </issue>
 
 </issues>
diff --git a/work/work-runtime-ktx/lint-baseline.xml b/work/work-runtime-ktx/lint-baseline.xml
index 8c4a032..67d7223 100644
--- a/work/work-runtime-ktx/lint-baseline.xml
+++ b/work/work-runtime-ktx/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="    public suspend fun setProgress(data: Data) {"
         errorLine2="                       ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/CoroutineWorker.kt"
-            line="109"
-            column="24"/>
+            file="src/main/java/androidx/work/CoroutineWorker.kt"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="    public suspend fun setForeground(foregroundInfo: ForegroundInfo) {"
         errorLine2="                       ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/CoroutineWorker.kt"
-            line="124"
-            column="24"/>
+            file="src/main/java/androidx/work/CoroutineWorker.kt"/>
     </issue>
 
 </issues>
diff --git a/work/work-runtime/lint-baseline.xml b/work/work-runtime/lint-baseline.xml
index 2680b7a..cbb8f75 100644
--- a/work/work-runtime/lint-baseline.xml
+++ b/work/work-runtime/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="        mHandlerThread.quitSafely();"
         errorLine2="                       ~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/work/impl/workers/ConstraintTrackingWorkerTest.java"
-            line="157"
-            column="24"/>
+            file="src/androidTest/java/androidx/work/impl/workers/ConstraintTrackingWorkerTest.java"/>
     </issue>
 
     <issue
@@ -18,9 +16,7 @@
         errorLine1="                sTriggeredContentAuthorities = getTriggeredContentAuthorities();"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java"
-            line="304"
-            column="48"/>
+            file="src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java"/>
     </issue>
 
     <issue
@@ -29,9 +25,7 @@
         errorLine1="                sTriggeredContentUris = getTriggeredContentUris();"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java"
-            line="305"
-            column="41"/>
+            file="src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java"/>
     </issue>
 
     <issue
@@ -40,9 +34,7 @@
         errorLine1="                sNetwork = getNetwork();"
         errorLine2="                           ~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java"
-            line="325"
-            column="28"/>
+            file="src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java"/>
     </issue>
 
     <issue
@@ -51,9 +43,7 @@
         errorLine1="        assertThat(worker.getTriggeredContentAuthorities(),"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java"
-            line="927"
-            column="27"/>
+            file="src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java"/>
     </issue>
 
     <issue
@@ -62,9 +52,7 @@
         errorLine1="        assertThat(worker.getTriggeredContentUris(),"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java"
-            line="929"
-            column="27"/>
+            file="src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java"/>
     </issue>
 
     <issue
@@ -73,9 +61,7 @@
         errorLine1="                            @Override"
         errorLine2="                            ^">
         <location
-            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"
-            line="226"
-            column="29"/>
+            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"/>
     </issue>
 
     <issue
@@ -84,9 +70,7 @@
         errorLine1="    @VisibleForTesting"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/work/impl/utils/WorkTimer.java"
-            line="123"
-            column="5"/>
+            file="src/main/java/androidx/work/impl/utils/WorkTimer.java"/>
     </issue>
 
     <issue
@@ -95,9 +79,7 @@
         errorLine1="    @VisibleForTesting"
         errorLine2="    ^">
         <location
-            file="src/main/java/androidx/work/impl/utils/WorkTimer.java"
-            line="129"
-            column="5"/>
+            file="src/main/java/androidx/work/impl/utils/WorkTimer.java"/>
     </issue>
 
     <issue
@@ -106,13 +88,9 @@
         errorLine1="    public @NonNull LiveData&lt;State> getState() {"
         errorLine2="                                    ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/OperationImpl.java"
-            line="52"
-            column="37"/>
+            file="src/main/java/androidx/work/impl/OperationImpl.java"/>
         <location
             file="src/main/java/androidx/work/impl/OperationImpl.java"
-            line="61"
-            column="17"
             message="Setter here"/>
     </issue>
 
@@ -122,9 +100,7 @@
         errorLine1="            @NonNull final TaskExecutor workTaskExecutor) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/LiveDataUtils.java"
-            line="54"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/utils/LiveDataUtils.java"/>
     </issue>
 
     <issue
@@ -133,9 +109,7 @@
         errorLine1="    public final void addListener(Runnable listener, Executor executor) {"
         errorLine2="                                  ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"
-            line="650"
-            column="35"/>
+            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"/>
     </issue>
 
     <issue
@@ -144,9 +118,7 @@
         errorLine1="    public final void addListener(Runnable listener, Executor executor) {"
         errorLine2="                                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"
-            line="650"
-            column="54"/>
+            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"/>
     </issue>
 
     <issue
@@ -155,9 +127,7 @@
         errorLine1="    protected boolean setException(Throwable throwable) {"
         errorLine2="                                   ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"
-            line="707"
-            column="36"/>
+            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"/>
     </issue>
 
     <issue
@@ -166,9 +136,7 @@
         errorLine1="    protected boolean setFuture(ListenableFuture&lt;? extends V> future) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"
-            line="743"
-            column="33"/>
+            file="src/main/java/androidx/work/impl/utils/futures/AbstractFuture.java"/>
     </issue>
 
     <issue
@@ -177,9 +145,7 @@
         errorLine1="    public Operation getOperation() {"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="54"
-            column="12"/>
+            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -188,9 +154,7 @@
         errorLine1="    public static CancelWorkRunnable forId("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="113"
-            column="19"/>
+            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -199,9 +163,7 @@
         errorLine1="    public static CancelWorkRunnable forTag("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="140"
-            column="19"/>
+            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -210,9 +172,7 @@
         errorLine1="    public static CancelWorkRunnable forName("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="172"
-            column="19"/>
+            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -221,9 +181,7 @@
         errorLine1="    public static CancelWorkRunnable forAll(@NonNull final WorkManagerImpl workManagerImpl) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"
-            line="206"
-            column="19"/>
+            file="src/main/java/androidx/work/impl/utils/CancelWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -232,9 +190,7 @@
         errorLine1="    public static Intent newConstraintProxyUpdateIntent("
         errorLine2="                  ~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.java"
-            line="61"
-            column="19"/>
+            file="src/main/java/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.java"/>
     </issue>
 
     <issue
@@ -243,9 +199,7 @@
         errorLine1="            Context context,"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.java"
-            line="62"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.java"/>
     </issue>
 
     <issue
@@ -254,9 +208,7 @@
         errorLine1="    public static InputMerger fromClassName(String className) {"
         errorLine2="                  ~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/InputMerger.java"
-            line="60"
-            column="19"/>
+            file="src/main/java/androidx/work/InputMerger.java"/>
     </issue>
 
     <issue
@@ -265,9 +217,7 @@
         errorLine1="    public static InputMerger fromClassName(String className) {"
         errorLine2="                                            ~~~~~~">
         <location
-            file="src/main/java/androidx/work/InputMerger.java"
-            line="60"
-            column="45"/>
+            file="src/main/java/androidx/work/InputMerger.java"/>
     </issue>
 
     <issue
@@ -276,9 +226,7 @@
         errorLine1="    public static &lt;In, Out> LiveData&lt;Out> dedupedMappedLiveDataFor("
         errorLine2="                            ~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/LiveDataUtils.java"
-            line="51"
-            column="29"/>
+            file="src/main/java/androidx/work/impl/utils/LiveDataUtils.java"/>
     </issue>
 
     <issue
@@ -287,9 +235,7 @@
         errorLine1="    public static boolean isComponentExplicitlyEnabled(Context context, Class&lt;?> klazz) {"
         errorLine2="                                                       ~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/PackageManagerHelper.java"
-            line="66"
-            column="56"/>
+            file="src/main/java/androidx/work/impl/utils/PackageManagerHelper.java"/>
     </issue>
 
     <issue
@@ -298,9 +244,7 @@
         errorLine1="    public static boolean isComponentExplicitlyEnabled(Context context, Class&lt;?> klazz) {"
         errorLine2="                                                                        ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/PackageManagerHelper.java"
-            line="66"
-            column="73"/>
+            file="src/main/java/androidx/work/impl/utils/PackageManagerHelper.java"/>
     </issue>
 
     <issue
@@ -309,9 +253,7 @@
         errorLine1="    public static boolean isComponentExplicitlyEnabled(Context context, String className) {"
         errorLine2="                                                       ~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/PackageManagerHelper.java"
-            line="77"
-            column="56"/>
+            file="src/main/java/androidx/work/impl/utils/PackageManagerHelper.java"/>
     </issue>
 
     <issue
@@ -320,9 +262,7 @@
         errorLine1="    public static boolean isComponentExplicitlyEnabled(Context context, String className) {"
         errorLine2="                                                                        ~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/PackageManagerHelper.java"
-            line="77"
-            column="73"/>
+            file="src/main/java/androidx/work/impl/utils/PackageManagerHelper.java"/>
     </issue>
 
     <issue
@@ -331,9 +271,7 @@
         errorLine1="    public PruneWorkRunnable(WorkManagerImpl workManagerImpl) {"
         errorLine2="                             ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/PruneWorkRunnable.java"
-            line="39"
-            column="30"/>
+            file="src/main/java/androidx/work/impl/utils/PruneWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -342,9 +280,7 @@
         errorLine1="    public Operation getOperation() {"
         errorLine2="           ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/PruneWorkRunnable.java"
-            line="47"
-            column="12"/>
+            file="src/main/java/androidx/work/impl/utils/PruneWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -353,9 +289,7 @@
         errorLine1="            List&lt;Scheduler> schedulers) {"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/Schedulers.java"
-            line="62"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/Schedulers.java"/>
     </issue>
 
     <issue
@@ -364,9 +298,7 @@
         errorLine1="    public static &lt;V> SettableFuture&lt;V> create() {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/futures/SettableFuture.java"
-            line="45"
-            column="23"/>
+            file="src/main/java/androidx/work/impl/utils/futures/SettableFuture.java"/>
     </issue>
 
     <issue
@@ -375,9 +307,7 @@
         errorLine1="    public boolean setException(Throwable throwable) {"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/futures/SettableFuture.java"
-            line="55"
-            column="33"/>
+            file="src/main/java/androidx/work/impl/utils/futures/SettableFuture.java"/>
     </issue>
 
     <issue
@@ -386,9 +316,7 @@
         errorLine1="    public boolean setFuture(ListenableFuture&lt;? extends V> future) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/futures/SettableFuture.java"
-            line="60"
-            column="30"/>
+            file="src/main/java/androidx/work/impl/utils/futures/SettableFuture.java"/>
     </issue>
 
     <issue
@@ -397,9 +325,7 @@
         errorLine1="            WorkManagerImpl workManagerImpl,"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/StartWorkRunnable.java"
-            line="36"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/utils/StartWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -408,9 +334,7 @@
         errorLine1="            String workSpecId,"
         errorLine2="            ~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/StartWorkRunnable.java"
-            line="37"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/utils/StartWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -419,9 +343,7 @@
         errorLine1="            WorkerParameters.RuntimeExtras runtimeExtras) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/StartWorkRunnable.java"
-            line="38"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/utils/StartWorkRunnable.java"/>
     </issue>
 
     <issue
@@ -430,9 +352,7 @@
         errorLine1="            Context context,"
         errorLine2="            ~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="78"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"/>
     </issue>
 
     <issue
@@ -441,9 +361,7 @@
         errorLine1="            WorkManagerImpl workManager,"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="79"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"/>
     </issue>
 
     <issue
@@ -452,9 +370,7 @@
         errorLine1="            JobScheduler jobScheduler,"
         errorLine2="            ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="80"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"/>
     </issue>
 
     <issue
@@ -463,9 +379,7 @@
         errorLine1="            SystemJobInfoConverter systemJobInfoConverter) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="81"
-            column="13"/>
+            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"/>
     </issue>
 
     <issue
@@ -474,9 +388,7 @@
         errorLine1="    public void scheduleInternal(WorkSpec workSpec, int jobId) {"
         errorLine2="                                 ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"
-            line="181"
-            column="34"/>
+            file="src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java"/>
     </issue>
 
     <issue
@@ -485,9 +397,7 @@
         errorLine1="    Executor getMainThreadExecutor();"
         errorLine2="    ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/taskexecutor/TaskExecutor.java"
-            line="36"
-            column="5"/>
+            file="src/main/java/androidx/work/impl/utils/taskexecutor/TaskExecutor.java"/>
     </issue>
 
     <issue
@@ -496,9 +406,7 @@
         errorLine1="    default void executeOnTaskThread(Runnable runnable) {"
         errorLine2="                                     ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/taskexecutor/TaskExecutor.java"
-            line="42"
-            column="38"/>
+            file="src/main/java/androidx/work/impl/utils/taskexecutor/TaskExecutor.java"/>
     </issue>
 
     <issue
@@ -507,9 +415,7 @@
         errorLine1="    SerialExecutor getSerialTaskExecutor();"
         errorLine2="    ~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/taskexecutor/TaskExecutor.java"
-            line="51"
-            column="5"/>
+            file="src/main/java/androidx/work/impl/utils/taskexecutor/TaskExecutor.java"/>
     </issue>
 
     <issue
@@ -518,9 +424,7 @@
         errorLine1="    public static PowerManager.WakeLock newWakeLock("
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/WakeLocks.java"
-            line="53"
-            column="19"/>
+            file="src/main/java/androidx/work/impl/utils/WakeLocks.java"/>
     </issue>
 
     <issue
@@ -529,9 +433,7 @@
         errorLine1="    public ExistingWorkPolicy getExistingWorkPolicy() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/WorkContinuationImpl.java"
-            line="76"
-            column="12"/>
+            file="src/main/java/androidx/work/impl/WorkContinuationImpl.java"/>
     </issue>
 
     <issue
@@ -540,9 +442,7 @@
         errorLine1="    public List&lt;String> getAllIds() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/WorkContinuationImpl.java"
-            line="90"
-            column="12"/>
+            file="src/main/java/androidx/work/impl/WorkContinuationImpl.java"/>
     </issue>
 
     <issue
@@ -551,9 +451,7 @@
         errorLine1="    public List&lt;WorkContinuationImpl> getParents() {"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/WorkContinuationImpl.java"
-            line="105"
-            column="12"/>
+            file="src/main/java/androidx/work/impl/WorkContinuationImpl.java"/>
     </issue>
 
     <issue
@@ -562,9 +460,7 @@
         errorLine1="    public static Set&lt;String> prerequisitesFor(WorkContinuationImpl continuation) {"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/WorkContinuationImpl.java"
-            line="276"
-            column="48"/>
+            file="src/main/java/androidx/work/impl/WorkContinuationImpl.java"/>
     </issue>
 
     <issue
@@ -573,9 +469,7 @@
         errorLine1="    public Executor getMainThreadExecutor() {"
         errorLine2="           ~~~~~~~~">
         <location
-            file="src/main/java/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor.java"
-            line="53"
-            column="12"/>
+            file="src/main/java/androidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor.java"/>
     </issue>
 
     <issue
@@ -584,9 +478,7 @@
         errorLine1="        public Network network;"
         errorLine2="               ~~~~~~~">
         <location
-            file="src/main/java/androidx/work/WorkerParameters.java"
-            line="216"
-            column="16"/>
+            file="src/main/java/androidx/work/WorkerParameters.java"/>
     </issue>
 
 </issues>
diff --git a/work/work-testing/lint-baseline.xml b/work/work-testing/lint-baseline.xml
index 7ebfc01..4ea287e 100644
--- a/work/work-testing/lint-baseline.xml
+++ b/work/work-testing/lint-baseline.xml
@@ -7,9 +7,7 @@
         errorLine1="            .setTriggeredContentAuthorities(authorities.toList())"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/androidTest/java/androidx/work/testing/TestWorkerBuilderTest.kt"
-            line="102"
-            column="14"/>
+            file="src/androidTest/java/androidx/work/testing/TestWorkerBuilderTest.kt"/>
     </issue>
 
     <issue