[go: nahoru, domu]

Moving test strings.xml files to donottranslate-strings.xml

Bug: 154563057

Generated via:

  find -wholename "*values/strings.xml" | grep "test\|Test\|demo" | sed 's/\(.*\)/\1 \1/' | sed 's/ \(.*\)strings.xml/ \1donottranslate-strings.xml/' | sed 's/^/git mv /' | bash

  ./gradlew lintDebug -PupdateLintBaseline

  git status | grep lint-baseline.xml | xargs wc -l | grep " 4 " | xargs -n 1 rm

Test: Treehugger runs busytown/*.sh
Merged-In: Ie9ff7cc767928e36c186023e085bcb9ac094a9a9
Change-Id: Ie9ff7cc767928e36c186023e085bcb9ac094a9a9
diff --git a/ads/ads-identifier-provider/integration-tests/testapp/src/main/res/values/strings.xml b/ads/ads-identifier-provider/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from ads/ads-identifier-provider/integration-tests/testapp/src/main/res/values/strings.xml
rename to ads/ads-identifier-provider/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/ads/ads-identifier/integration-tests/testapp/src/main/res/values/strings.xml b/ads/ads-identifier/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from ads/ads-identifier/integration-tests/testapp/src/main/res/values/strings.xml
rename to ads/ads-identifier/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/appcompat/appcompat-resources/lint-baseline.xml b/appcompat/appcompat-resources/lint-baseline.xml
index 8dbe82f..383403b 100644
--- a/appcompat/appcompat-resources/lint-baseline.xml
+++ b/appcompat/appcompat-resources/lint-baseline.xml
@@ -168,17 +168,6 @@
 
     <issue
         id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.appcompat.content.res.AppCompatResources is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            return context.getColorStateList(resId);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appcompat/content/res/AppCompatResources.java"
-            line="69"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
         message="This call references a method added in API level 29; however, the containing class androidx.appcompat.widget.DrawableUtils is reachable from earlier API levels and will fail run-time class verification."
         errorLine1="            final android.graphics.Insets insets = drawable.getOpticalInsets();"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~">
@@ -331,7 +320,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/content/res/AppCompatResources.java"
-            line="66"
+            line="47"
             column="19"/>
     </issue>
 
diff --git a/appcompat/appcompat/lint-baseline.xml b/appcompat/appcompat/lint-baseline.xml
index 7b43ab1..d9ee4cc 100644
--- a/appcompat/appcompat/lint-baseline.xml
+++ b/appcompat/appcompat/lint-baseline.xml
@@ -5524,17 +5524,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCustomSelectionActionModeCallback(ActionMode.Callback actionModeCallback) {"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatAutoCompleteTextView.java"
-            line="202"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public void setTextAppearance(Context context, int resId) {"
         errorLine2="                                  ~~~~~~~">
         <location
@@ -5590,17 +5579,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCustomSelectionActionModeCallback(ActionMode.Callback actionModeCallback) {"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatButton.java"
-            line="375"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    void onSupportActionModeStarted(ActionMode mode);"
         errorLine2="                                    ~~~~~~~~~~">
         <location
@@ -5645,17 +5623,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCustomSelectionActionModeCallback(ActionMode.Callback actionModeCallback) {"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatCheckedTextView.java"
-            line="268"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public abstract MenuInflater getMenuInflater();"
         errorLine2="                    ~~~~~~~~~~~~">
         <location
@@ -6052,22 +6019,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCustomSelectionActionModeCallback(ActionMode.Callback actionModeCallback) {"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatEditText.java"
-            line="241"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public boolean onDragEvent(@SuppressWarnings(&quot;MissingNullability&quot;) DragEvent event) {"
         errorLine2="                                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatEditText.java"
-            line="277"
+            line="285"
             column="72"/>
     </issue>
 
@@ -6360,22 +6316,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCustomSelectionActionModeCallback(ActionMode.Callback actionModeCallback) {"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="446"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public CharSequence getText() {"
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/appcompat/widget/AppCompatTextView.java"
-            line="500"
+            line="508"
             column="12"/>
     </issue>
 
@@ -12179,17 +12124,6 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCustomSelectionActionModeCallback(ActionMode.Callback actionModeCallback) {"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/appcompat/widget/SwitchCompat.java"
-            line="1460"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public static TintTypedArray obtainStyledAttributes(Context context, AttributeSet set,"
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
diff --git a/appcompat/appcompat/src/androidTest/res/values/strings.xml b/appcompat/appcompat/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from appcompat/appcompat/src/androidTest/res/values/strings.xml
rename to appcompat/appcompat/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/appcompat/integration-tests/receive-content-testapp/src/main/res/values/strings.xml b/appcompat/integration-tests/receive-content-testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from appcompat/integration-tests/receive-content-testapp/src/main/res/values/strings.xml
rename to appcompat/integration-tests/receive-content-testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/benchmark/integration-tests/macrobenchmark-target/src/main/res/values/strings.xml b/benchmark/integration-tests/macrobenchmark-target/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from benchmark/integration-tests/macrobenchmark-target/src/main/res/values/strings.xml
rename to benchmark/integration-tests/macrobenchmark-target/src/main/res/values/donottranslate-strings.xml
diff --git a/benchmark/macro/lint-baseline.xml b/benchmark/macro/lint-baseline.xml
index 039577a..6a2e95c 100644
--- a/benchmark/macro/lint-baseline.xml
+++ b/benchmark/macro/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/benchmark/macro/Macrobenchmark.kt"
-            line="45"
+            line="49"
             column="26"/>
     </issue>
 
diff --git a/biometric/biometric-ktx/samples/lint-baseline.xml b/biometric/biometric-ktx/samples/lint-baseline.xml
deleted file mode 100644
index f4e473c..0000000
--- a/biometric/biometric-ktx/samples/lint-baseline.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta06" client="gradle" variant="debug" version="4.2.0-beta06">
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="    val keySpec = KeyGenParameterSpec.Builder(KEY_NAME, keyPurpose).apply {"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="110"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setBlockModes(KeyProperties.BLOCK_MODE_CBC)"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="111"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="112"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setUserAuthenticationRequired(true)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="113"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="    }.build()"
-        errorLine2="      ~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="121"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="    val keySpec = KeyGenParameterSpec.Builder(KEY_NAME, keyPurpose).apply {"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="171"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setBlockModes(KeyProperties.BLOCK_MODE_CBC)"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="172"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="173"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setUserAuthenticationRequired(true)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="174"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="    }.build()"
-        errorLine2="      ~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="182"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="    val keySpec = KeyGenParameterSpec.Builder(KEY_NAME, keyPurpose).apply {"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="232"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setBlockModes(KeyProperties.BLOCK_MODE_CBC)"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="233"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="234"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        setUserAuthenticationRequired(true)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="235"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.biometric.samples.auth.CoroutineSamplesKt is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="    }.build()"
-        errorLine2="      ~~~~~">
-        <location
-            file="src/main/java/androidx/biometric/samples/auth/CoroutineSamples.kt"
-            line="242"
-            column="7"/>
-    </issue>
-
-</issues>
diff --git a/biometric/integration-tests/testapp/src/main/res/values/strings.xml b/biometric/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from biometric/integration-tests/testapp/src/main/res/values/strings.xml
rename to biometric/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/camera/camera-camera2/lint-baseline.xml b/camera/camera-camera2/lint-baseline.xml
index 7200b63..a541188 100644
--- a/camera/camera-camera2/lint-baseline.xml
+++ b/camera/camera-camera2/lint-baseline.xml
@@ -140,7 +140,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/internal/SynchronizedCaptureSessionStateCallbacks.java"
-            line="117"
+            line="124"
             column="48"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/camera2/internal/SynchronizedCaptureSessionStateCallbacks.java"
-            line="136"
+            line="143"
             column="48"/>
     </issue>
 
diff --git a/camera/integration-tests/camerapipetestapp/src/main/res/values/strings.xml b/camera/integration-tests/camerapipetestapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from camera/integration-tests/camerapipetestapp/src/main/res/values/strings.xml
rename to camera/integration-tests/camerapipetestapp/src/main/res/values/donottranslate-strings.xml
diff --git a/camera/integration-tests/coretestapp/lint-baseline.xml b/camera/integration-tests/coretestapp/lint-baseline.xml
index 6e3cfff..444e113 100644
--- a/camera/integration-tests/coretestapp/lint-baseline.xml
+++ b/camera/integration-tests/coretestapp/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="357"
+            line="355"
             column="39"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="369"
+            line="367"
             column="35"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="184"
+            line="182"
             column="13"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="187"
+            line="185"
             column="22"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="188"
+            line="186"
             column="21"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="386"
+            line="384"
             column="25"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="389"
+            line="387"
             column="25"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="398"
+            line="396"
             column="33"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="407"
+            line="405"
             column="45"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/camera/integration/core/CameraXActivity.java"
-            line="429"
+            line="427"
             column="45"/>
     </issue>
 
diff --git a/camera/integration-tests/coretestapp/src/main/res/values/strings.xml b/camera/integration-tests/coretestapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from camera/integration-tests/coretestapp/src/main/res/values/strings.xml
rename to camera/integration-tests/coretestapp/src/main/res/values/donottranslate-strings.xml
diff --git a/camera/integration-tests/extensionstestapp/src/main/res/values/strings.xml b/camera/integration-tests/extensionstestapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from camera/integration-tests/extensionstestapp/src/main/res/values/strings.xml
rename to camera/integration-tests/extensionstestapp/src/main/res/values/donottranslate-strings.xml
diff --git a/camera/integration-tests/timingtestapp/lint-baseline.xml b/camera/integration-tests/timingtestapp/lint-baseline.xml
index aa4e397..61d8df2 100644
--- a/camera/integration-tests/timingtestapp/lint-baseline.xml
+++ b/camera/integration-tests/timingtestapp/lint-baseline.xml
@@ -47,6 +47,149 @@
 
     <issue
         id="UnusedResources"
+        message="The resource `R.string.label_camera1` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_camera1&quot;>Camera1&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="21"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.label_camera2` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_camera2&quot;>Camera2&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="22"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.label_camerax` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_camerax&quot;>CameraX&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="23"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.label_size_max` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_size_max&quot;>Max image size&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="24"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.label_size_min` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_size_min&quot;>Min image size&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="25"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.label_focus_auto` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_focus_auto&quot;>Auto-focus&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="26"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.label_focus_continuous` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_focus_continuous&quot;>Continuous focus&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="27"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.label_camera` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_camera&quot;>Camera:&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="28"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.label_log` appears to be unused"
+        errorLine1="    &lt;string name=&quot;label_log&quot;>Log: &lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="32"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.settings_numtests_summary` appears to be unused"
+        errorLine1="    &lt;string name=&quot;settings_numtests_summary&quot;>Number of repetitions to do for repeated tests&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="46"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.settings_previewbuffer_summary` appears to be unused"
+        errorLine1="    &lt;string name=&quot;settings_previewbuffer_summary&quot;>Length of time to allow the preview buffer to run before trying to capture an image. Longer values will ensure the hardware frame buffer is full to offer accurate capture-only latency.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="50"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.settings_autotest_header` appears to be unused"
+        errorLine1="    &lt;string name=&quot;settings_autotest_header&quot;>Auto-test settings&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="52"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.settings_autotest_header_key` appears to be unused"
+        errorLine1="    &lt;string name=&quot;settings_autotest_header_key&quot;>settings_autotest_header_key&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/donottranslate-strings.xml"
+            line="53"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
         message="The resource `R.color.ic_launcher_background` appears to be unused"
         errorLine1="    &lt;color name=&quot;ic_launcher_background&quot;>#A617A1&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -67,147 +210,4 @@
             column="1"/>
     </issue>
 
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_camera1` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_camera1&quot;>Camera1&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="21"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_camera2` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_camera2&quot;>Camera2&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="22"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_camerax` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_camerax&quot;>CameraX&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="23"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_size_max` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_size_max&quot;>Max image size&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="24"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_size_min` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_size_min&quot;>Min image size&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="25"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_focus_auto` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_focus_auto&quot;>Auto-focus&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="26"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_focus_continuous` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_focus_continuous&quot;>Continuous focus&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="27"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_camera` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_camera&quot;>Camera:&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="28"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.label_log` appears to be unused"
-        errorLine1="    &lt;string name=&quot;label_log&quot;>Log: &lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="32"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.settings_numtests_summary` appears to be unused"
-        errorLine1="    &lt;string name=&quot;settings_numtests_summary&quot;>Number of repetitions to do for repeated tests&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="46"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.settings_previewbuffer_summary` appears to be unused"
-        errorLine1="    &lt;string name=&quot;settings_previewbuffer_summary&quot;>Length of time to allow the preview buffer to run before trying to capture an image. Longer values will ensure the hardware frame buffer is full to offer accurate capture-only latency.&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="50"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.settings_autotest_header` appears to be unused"
-        errorLine1="    &lt;string name=&quot;settings_autotest_header&quot;>Auto-test settings&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="52"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.settings_autotest_header_key` appears to be unused"
-        errorLine1="    &lt;string name=&quot;settings_autotest_header_key&quot;>settings_autotest_header_key&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="53"
-            column="13"/>
-    </issue>
-
 </issues>
diff --git a/camera/integration-tests/timingtestapp/src/main/res/values/strings.xml b/camera/integration-tests/timingtestapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from camera/integration-tests/timingtestapp/src/main/res/values/strings.xml
rename to camera/integration-tests/timingtestapp/src/main/res/values/donottranslate-strings.xml
diff --git a/camera/integration-tests/uiwidgetstestapp/src/main/res/values/strings.xml b/camera/integration-tests/uiwidgetstestapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from camera/integration-tests/uiwidgetstestapp/src/main/res/values/strings.xml
rename to camera/integration-tests/uiwidgetstestapp/src/main/res/values/donottranslate-strings.xml
diff --git a/camera/integration-tests/viewtestapp/lint-baseline.xml b/camera/integration-tests/viewtestapp/lint-baseline.xml
index 13ee99b..2c3854f 100644
--- a/camera/integration-tests/viewtestapp/lint-baseline.xml
+++ b/camera/integration-tests/viewtestapp/lint-baseline.xml
@@ -95,7 +95,7 @@
         errorLine1="    &lt;string name=&quot;preview&quot;>Preview&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="20"
             column="13"/>
     </issue>
@@ -106,7 +106,7 @@
         errorLine1="    &lt;string name=&quot;btn_confirm&quot;>Confirm&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="42"
             column="13"/>
     </issue>
@@ -117,7 +117,7 @@
         errorLine1="    &lt;string name=&quot;btn_cancel&quot;>Cancel&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="43"
             column="13"/>
     </issue>
diff --git a/camera/integration-tests/viewtestapp/src/main/res/values/strings.xml b/camera/integration-tests/viewtestapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from camera/integration-tests/viewtestapp/src/main/res/values/strings.xml
rename to camera/integration-tests/viewtestapp/src/main/res/values/donottranslate-strings.xml
diff --git a/car/app/app-samples/navigation/common/lint-baseline.xml b/car/app/app-samples/navigation/common/lint-baseline.xml
index e3b52a1..e9956c6 100644
--- a/car/app/app-samples/navigation/common/lint-baseline.xml
+++ b/car/app/app-samples/navigation/common/lint-baseline.xml
@@ -30,7 +30,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="449"
+            line="451"
             column="17"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="450"
+            line="452"
             column="26"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                         ~~~~~">
         <location
             file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="451"
+            line="453"
             column="26"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="464"
+            line="466"
             column="38"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="469"
+            line="471"
             column="26"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="486"
+            line="488"
             column="26"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="503"
+            line="505"
             column="21"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java"
-            line="504"
+            line="506"
             column="34"/>
     </issue>
 
diff --git a/car/app/app-samples/showcase/common/lint-baseline.xml b/car/app/app-samples/showcase/common/lint-baseline.xml
index df7846f9..89c30e2 100644
--- a/car/app/app-samples/showcase/common/lint-baseline.xml
+++ b/car/app/app-samples/showcase/common/lint-baseline.xml
@@ -3,17 +3,6 @@
 
     <issue
         id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.car.app.sample.showcase.common.navigation.NavigationNotificationService is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    new NotificationChannel("
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationNotificationService.java"
-            line="112"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
         message="This call references a method added in API level 26; however, the containing class androidx.car.app.sample.showcase.common.navigation.NavigationNotificationsDemoScreen is reachable from earlier API levels and will fail run-time class verification."
         errorLine1="                                        context.startForegroundService(intent);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~">
@@ -23,15 +12,4 @@
             column="49"/>
     </issue>
 
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.car.app.sample.showcase.common.misc.NotificationDemoScreen is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    new NotificationChannel("
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/car/app/sample/showcase/common/misc/NotificationDemoScreen.java"
-            line="228"
-            column="21"/>
-    </issue>
-
 </issues>
diff --git a/compose/material/material/integration-tests/material-catalog/src/main/res/values/strings.xml b/compose/material/material/integration-tests/material-catalog/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from compose/material/material/integration-tests/material-catalog/src/main/res/values/strings.xml
rename to compose/material/material/integration-tests/material-catalog/src/main/res/values/donottranslate-strings.xml
diff --git a/compose/ui/ui-text/lint-baseline.xml b/compose/ui/ui-text/lint-baseline.xml
deleted file mode 100644
index 25b8744..0000000
--- a/compose/ui/ui-text/lint-baseline.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta06" client="gradle" variant="debug" version="4.2.0-beta06">
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            Builder.obtain(text, start, end, paint, width)"
-        errorLine2="                    ~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="108"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setTextDirection(textDir)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="110"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setAlignment(alignment)"
-        errorLine2="                    ~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="111"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setMaxLines(maxLines)"
-        errorLine2="                    ~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="112"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setEllipsize(ellipsize)"
-        errorLine2="                    ~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="113"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setEllipsizedWidth(ellipsizedWidth)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="114"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setLineSpacing(lineSpacingExtra, lineSpacingMultiplier)"
-        errorLine2="                    ~~~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="115"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 26; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        setJustificationMode(justificationMode)"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="117"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setIncludePad(includePadding)"
-        errorLine2="                    ~~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="119"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                        setUseLineSpacingFromFallbacks(fallbackLineSpacing)"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="121"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setBreakStrategy(breakStrategy)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="123"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setHyphenationFrequency(hyphenationFrequency)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="124"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    setIndents(leftIndents, rightIndents)"
-        errorLine2="                    ~~~~~~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="125"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 23; however, the containing class androidx.compose.ui.text.android.StaticLayoutFactory is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                }.build()"
-        errorLine2="                  ~~~~~">
-        <location
-            file="../../../text/text/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt"
-            line="126"
-            column="19"/>
-    </issue>
-
-</issues>
diff --git a/compose/ui/ui/lint-baseline.xml b/compose/ui/ui/lint-baseline.xml
index 21edf21..b77b0bd 100644
--- a/compose/ui/ui/lint-baseline.xml
+++ b/compose/ui/ui/lint-baseline.xml
@@ -19,7 +19,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/androidMain/kotlin/androidx/compose/ui/platform/ViewLayer.android.kt"
-            line="296"
+            line="315"
             column="17"/>
     </issue>
 
diff --git a/compose/ui/ui/src/androidAndroidTest/res/values/strings.xml b/compose/ui/ui/src/androidAndroidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from compose/ui/ui/src/androidAndroidTest/res/values/strings.xml
rename to compose/ui/ui/src/androidAndroidTest/res/values/donottranslate-strings.xml
diff --git a/core/core-ktx/src/androidTest/res/values/strings.xml b/core/core-ktx/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from core/core-ktx/src/androidTest/res/values/strings.xml
rename to core/core-ktx/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/core/core/lint-baseline.xml b/core/core/lint-baseline.xml
index 978eb9b..1430b6f 100644
--- a/core/core/lint-baseline.xml
+++ b/core/core/lint-baseline.xml
@@ -9479,7 +9479,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="800"
+            line="801"
             column="64"/>
     </issue>
 
@@ -11613,7 +11613,7 @@
         errorLine2="                         ~~~~~~~~~">
         <location
             file="src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java"
-            line="874"
+            line="875"
             column="26"/>
     </issue>
 
diff --git a/core/core/src/androidTest/res/values/strings.xml b/core/core/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from core/core/src/androidTest/res/values/strings.xml
rename to core/core/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/fragment/fragment/lint-baseline.xml b/fragment/fragment/lint-baseline.xml
index 0abf452..6dd6d46 100644
--- a/fragment/fragment/lint-baseline.xml
+++ b/fragment/fragment/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/fragment/app/Fragment.java"
-            line="2956"
+            line="2922"
             column="35"/>
     </issue>
 
diff --git a/fragment/fragment/src/androidTest/res/values/strings.xml b/fragment/fragment/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from fragment/fragment/src/androidTest/res/values/strings.xml
rename to fragment/fragment/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/fragment/integration-tests/testapp/src/main/res/layouts/kittenFragmentTransitions/values/strings.xml b/fragment/integration-tests/testapp/src/main/res/layouts/kittenFragmentTransitions/values/donottranslate-strings.xml
similarity index 100%
rename from fragment/integration-tests/testapp/src/main/res/layouts/kittenFragmentTransitions/values/strings.xml
rename to fragment/integration-tests/testapp/src/main/res/layouts/kittenFragmentTransitions/values/donottranslate-strings.xml
diff --git a/fragment/integration-tests/testapp/src/main/res/values/strings.xml b/fragment/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from fragment/integration-tests/testapp/src/main/res/values/strings.xml
rename to fragment/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/leanback/leanback/lint-baseline.xml b/leanback/leanback/lint-baseline.xml
index 910b444..33c805d 100644
--- a/leanback/leanback/lint-baseline.xml
+++ b/leanback/leanback/lint-baseline.xml
@@ -20586,7 +20586,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="156"
+            line="148"
             column="26"/>
     </issue>
 
@@ -20597,7 +20597,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="160"
+            line="152"
             column="26"/>
     </issue>
 
@@ -20608,7 +20608,7 @@
         errorLine2="                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="160"
+            line="152"
             column="43"/>
     </issue>
 
@@ -20619,7 +20619,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="165"
+            line="157"
             column="26"/>
     </issue>
 
@@ -20630,7 +20630,7 @@
         errorLine2="                                          ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="165"
+            line="157"
             column="43"/>
     </issue>
 
@@ -20641,7 +20641,7 @@
         errorLine2="                        ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="230"
+            line="223"
             column="25"/>
     </issue>
 
@@ -20652,7 +20652,7 @@
         errorLine2="                                                                    ~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="250"
+            line="243"
             column="69"/>
     </issue>
 
@@ -20663,7 +20663,7 @@
         errorLine2="                           ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="266"
+            line="260"
             column="28"/>
     </issue>
 
@@ -20674,7 +20674,7 @@
         errorLine2="           ~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="275"
+            line="270"
             column="12"/>
     </issue>
 
@@ -20685,7 +20685,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="283"
+            line="279"
             column="41"/>
     </issue>
 
@@ -20696,7 +20696,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="319"
+            line="317"
             column="30"/>
     </issue>
 
@@ -20707,7 +20707,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/androidx/leanback/widget/SearchOrbView.java"
-            line="333"
+            line="331"
             column="12"/>
     </issue>
 
diff --git a/leanback/leanback/src/androidTest/res/values/strings.xml b/leanback/leanback/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from leanback/leanback/src/androidTest/res/values/strings.xml
rename to leanback/leanback/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/lint-demos/lint-demo-appcompat/src/main/res/values/strings.xml b/lint-demos/lint-demo-appcompat/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from lint-demos/lint-demo-appcompat/src/main/res/values/strings.xml
rename to lint-demos/lint-demo-appcompat/src/main/res/values/donottranslate-strings.xml
diff --git a/media/media/lint-baseline.xml b/media/media/lint-baseline.xml
index fe2ad39..41b05e6 100644
--- a/media/media/lint-baseline.xml
+++ b/media/media/lint-baseline.xml
@@ -239,7 +239,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="297"
+            line="301"
             column="21"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="168"
+            line="169"
             column="33"/>
     </issue>
 
@@ -261,7 +261,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="170"
+            line="171"
             column="22"/>
     </issue>
 
@@ -272,7 +272,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="191"
+            line="192"
             column="54"/>
     </issue>
 
@@ -283,7 +283,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="195"
+            line="196"
             column="64"/>
     </issue>
 
@@ -294,7 +294,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="2265"
+            line="2270"
             column="47"/>
     </issue>
 
@@ -305,7 +305,7 @@
         errorLine2="                             ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="2389"
+            line="2394"
             column="30"/>
     </issue>
 
@@ -316,7 +316,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="2398"
+            line="2403"
             column="30"/>
     </issue>
 
@@ -327,7 +327,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="2410"
+            line="2415"
             column="30"/>
     </issue>
 
@@ -338,7 +338,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="2422"
+            line="2427"
             column="30"/>
     </issue>
 
@@ -349,7 +349,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="2490"
+            line="2495"
             column="30"/>
     </issue>
 
@@ -360,7 +360,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="2532"
+            line="2537"
             column="30"/>
     </issue>
 
@@ -569,7 +569,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="604"
+            line="613"
             column="20"/>
     </issue>
 
@@ -580,7 +580,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="606"
+            line="615"
             column="20"/>
     </issue>
 
@@ -591,7 +591,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2222"
+            line="2231"
             column="24"/>
     </issue>
 
@@ -602,7 +602,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2243"
+            line="2252"
             column="50"/>
     </issue>
 
@@ -613,7 +613,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2246"
+            line="2255"
             column="36"/>
     </issue>
 
@@ -624,7 +624,7 @@
         errorLine2="                            ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="3965"
+            line="3974"
             column="29"/>
     </issue>
 
@@ -1713,7 +1713,7 @@
         errorLine2="                          ~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="103"
+            line="106"
             column="27"/>
     </issue>
 
@@ -1724,7 +1724,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="103"
+            line="106"
             column="44"/>
     </issue>
 
@@ -1735,7 +1735,7 @@
         errorLine2="                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="188"
+            line="191"
             column="19"/>
     </issue>
 
@@ -1746,7 +1746,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="188"
+            line="191"
             column="41"/>
     </issue>
 
@@ -1757,7 +1757,7 @@
         errorLine2="                                                                               ~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="188"
+            line="191"
             column="80"/>
     </issue>
 
@@ -1768,7 +1768,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="221"
+            line="224"
             column="19"/>
     </issue>
 
@@ -1779,7 +1779,7 @@
         errorLine2="                                                              ~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="221"
+            line="224"
             column="63"/>
     </issue>
 
@@ -1790,7 +1790,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="254"
+            line="258"
             column="19"/>
     </issue>
 
@@ -1801,7 +1801,7 @@
         errorLine2="                                                              ~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="254"
+            line="258"
             column="63"/>
     </issue>
 
@@ -1812,7 +1812,7 @@
         errorLine2="            ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="255"
+            line="259"
             column="13"/>
     </issue>
 
@@ -1823,7 +1823,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="279"
+            line="283"
             column="19"/>
     </issue>
 
@@ -1834,7 +1834,7 @@
         errorLine2="                                                                ~~~~~~~">
         <location
             file="src/main/java/androidx/media/session/MediaButtonReceiver.java"
-            line="279"
+            line="283"
             column="65"/>
     </issue>
 
@@ -1845,7 +1845,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="161"
+            line="162"
             column="13"/>
     </issue>
 
@@ -1856,7 +1856,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="185"
+            line="186"
             column="19"/>
     </issue>
 
@@ -1867,7 +1867,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="234"
+            line="235"
             column="34"/>
     </issue>
 
@@ -1878,7 +1878,7 @@
         errorLine2="                                 ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="253"
+            line="254"
             column="34"/>
     </issue>
 
@@ -1889,7 +1889,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="271"
+            line="272"
             column="12"/>
     </issue>
 
@@ -1900,7 +1900,7 @@
         errorLine2="                                            ~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="282"
+            line="283"
             column="45"/>
     </issue>
 
@@ -1911,7 +1911,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="299"
+            line="300"
             column="12"/>
     </issue>
 
@@ -1922,7 +1922,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="308"
+            line="309"
             column="12"/>
     </issue>
 
@@ -1933,7 +1933,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="318"
+            line="319"
             column="12"/>
     </issue>
 
@@ -1944,7 +1944,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="334"
+            line="335"
             column="30"/>
     </issue>
 
@@ -1955,7 +1955,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="354"
+            line="355"
             column="30"/>
     </issue>
 
@@ -1966,7 +1966,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="371"
+            line="372"
             column="33"/>
     </issue>
 
@@ -1977,7 +1977,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="401"
+            line="402"
             column="12"/>
     </issue>
 
@@ -1988,7 +1988,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="408"
+            line="409"
             column="12"/>
     </issue>
 
@@ -1999,7 +1999,7 @@
         errorLine2="           ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="488"
+            line="489"
             column="12"/>
     </issue>
 
@@ -2010,7 +2010,7 @@
         errorLine2="           ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="498"
+            line="499"
             column="12"/>
     </issue>
 
@@ -2021,7 +2021,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="507"
+            line="508"
             column="12"/>
     </issue>
 
@@ -2032,7 +2032,7 @@
         errorLine2="                                                             ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="575"
+            line="576"
             column="62"/>
     </issue>
 
@@ -2043,7 +2043,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="653"
+            line="654"
             column="12"/>
     </issue>
 
@@ -2054,7 +2054,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="683"
+            line="684"
             column="12"/>
     </issue>
 
@@ -2065,7 +2065,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="728"
+            line="729"
             column="36"/>
     </issue>
 
@@ -2076,7 +2076,7 @@
         errorLine2="                                                 ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="728"
+            line="729"
             column="50"/>
     </issue>
 
@@ -2087,7 +2087,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="736"
+            line="737"
             column="44"/>
     </issue>
 
@@ -2098,7 +2098,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="745"
+            line="746"
             column="39"/>
     </issue>
 
@@ -2109,7 +2109,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="756"
+            line="757"
             column="36"/>
     </issue>
 
@@ -2120,7 +2120,7 @@
         errorLine2="                                        ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="766"
+            line="767"
             column="41"/>
     </issue>
 
@@ -2131,7 +2131,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="775"
+            line="776"
             column="37"/>
     </issue>
 
@@ -2142,7 +2142,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="783"
+            line="784"
             column="40"/>
     </issue>
 
@@ -2153,7 +2153,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="822"
+            line="823"
             column="16"/>
     </issue>
 
@@ -2164,7 +2164,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1169"
+            line="1174"
             column="49"/>
     </issue>
 
@@ -2175,7 +2175,7 @@
         errorLine2="                                                                ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1169"
+            line="1174"
             column="65"/>
     </issue>
 
@@ -2186,7 +2186,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1181"
+            line="1186"
             column="48"/>
     </issue>
 
@@ -2197,7 +2197,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1181"
+            line="1186"
             column="62"/>
     </issue>
 
@@ -2208,7 +2208,7 @@
         errorLine2="                                            ~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1192"
+            line="1197"
             column="45"/>
     </issue>
 
@@ -2219,7 +2219,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1192"
+            line="1197"
             column="54"/>
     </issue>
 
@@ -2230,7 +2230,7 @@
         errorLine2="                                             ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1206"
+            line="1211"
             column="46"/>
     </issue>
 
@@ -2241,7 +2241,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1206"
+            line="1211"
             column="62"/>
     </issue>
 
@@ -2252,7 +2252,7 @@
         errorLine2="                                            ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1217"
+            line="1222"
             column="45"/>
     </issue>
 
@@ -2263,7 +2263,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1217"
+            line="1222"
             column="59"/>
     </issue>
 
@@ -2274,7 +2274,7 @@
         errorLine2="                                         ~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1226"
+            line="1231"
             column="42"/>
     </issue>
 
@@ -2285,7 +2285,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1226"
+            line="1231"
             column="51"/>
     </issue>
 
@@ -2296,7 +2296,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1282"
+            line="1287"
             column="40"/>
     </issue>
 
@@ -2307,7 +2307,7 @@
         errorLine2="                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1296"
+            line="1301"
             column="40"/>
     </issue>
 
@@ -2318,7 +2318,7 @@
         errorLine2="                                                            ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1296"
+            line="1301"
             column="61"/>
     </issue>
 
@@ -2329,7 +2329,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1342"
+            line="1347"
             column="47"/>
     </issue>
 
@@ -2340,7 +2340,7 @@
         errorLine2="                ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1343"
+            line="1348"
             column="17"/>
     </issue>
 
@@ -2351,7 +2351,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1361"
+            line="1366"
             column="47"/>
     </issue>
 
@@ -2362,7 +2362,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaControllerCompat.java"
-            line="1361"
+            line="1366"
             column="62"/>
     </issue>
 
@@ -2890,7 +2890,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="620"
+            line="629"
             column="29"/>
     </issue>
 
@@ -2901,7 +2901,7 @@
         errorLine2="                            ~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="636"
+            line="645"
             column="29"/>
     </issue>
 
@@ -2912,7 +2912,7 @@
         errorLine2="                                               ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="636"
+            line="645"
             column="48"/>
     </issue>
 
@@ -2923,7 +2923,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="652"
+            line="661"
             column="36"/>
     </issue>
 
@@ -2934,7 +2934,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="669"
+            line="678"
             column="40"/>
     </issue>
 
@@ -2945,7 +2945,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="711"
+            line="720"
             column="37"/>
     </issue>
 
@@ -2956,7 +2956,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="755"
+            line="764"
             column="34"/>
     </issue>
 
@@ -2967,7 +2967,7 @@
         errorLine2="                                               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="755"
+            line="764"
             column="48"/>
     </issue>
 
@@ -2978,7 +2978,7 @@
         errorLine2="           ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="785"
+            line="794"
             column="12"/>
     </issue>
 
@@ -2989,7 +2989,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="795"
+            line="804"
             column="12"/>
     </issue>
 
@@ -3000,7 +3000,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="804"
+            line="813"
             column="34"/>
     </issue>
 
@@ -3011,7 +3011,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="816"
+            line="825"
             column="29"/>
     </issue>
 
@@ -3022,7 +3022,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="832"
+            line="841"
             column="26"/>
     </issue>
 
@@ -3033,7 +3033,7 @@
         errorLine2="                              ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="856"
+            line="865"
             column="31"/>
     </issue>
 
@@ -3044,7 +3044,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="925"
+            line="934"
             column="27"/>
     </issue>
 
@@ -3055,7 +3055,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="939"
+            line="948"
             column="12"/>
     </issue>
 
@@ -3066,7 +3066,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="953"
+            line="962"
             column="12"/>
     </issue>
 
@@ -3077,7 +3077,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="989"
+            line="998"
             column="12"/>
     </issue>
 
@@ -3088,7 +3088,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1000"
+            line="1009"
             column="43"/>
     </issue>
 
@@ -3099,7 +3099,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1013"
+            line="1022"
             column="46"/>
     </issue>
 
@@ -3110,7 +3110,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1036"
+            line="1045"
             column="19"/>
     </issue>
 
@@ -3121,7 +3121,7 @@
         errorLine2="                                                      ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1036"
+            line="1045"
             column="55"/>
     </issue>
 
@@ -3132,7 +3132,7 @@
         errorLine2="                                                                       ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1036"
+            line="1045"
             column="72"/>
     </issue>
 
@@ -3143,7 +3143,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1169"
+            line="1178"
             column="31"/>
     </issue>
 
@@ -3154,7 +3154,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1169"
+            line="1178"
             column="47"/>
     </issue>
 
@@ -3165,7 +3165,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1169"
+            line="1178"
             column="62"/>
     </issue>
 
@@ -3176,7 +3176,7 @@
         errorLine2="                                          ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1183"
+            line="1192"
             column="43"/>
     </issue>
 
@@ -3187,7 +3187,7 @@
         errorLine2="                                         ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1276"
+            line="1285"
             column="42"/>
     </issue>
 
@@ -3198,7 +3198,7 @@
         errorLine2="                                                         ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1276"
+            line="1285"
             column="58"/>
     </issue>
 
@@ -3209,7 +3209,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1286"
+            line="1295"
             column="41"/>
     </issue>
 
@@ -3220,7 +3220,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1286"
+            line="1295"
             column="55"/>
     </issue>
 
@@ -3231,7 +3231,7 @@
         errorLine2="                                     ~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1294"
+            line="1303"
             column="38"/>
     </issue>
 
@@ -3242,7 +3242,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1294"
+            line="1303"
             column="47"/>
     </issue>
 
@@ -3253,7 +3253,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1307"
+            line="1316"
             column="39"/>
     </issue>
 
@@ -3264,7 +3264,7 @@
         errorLine2="                                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1307"
+            line="1316"
             column="55"/>
     </issue>
 
@@ -3275,7 +3275,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1316"
+            line="1325"
             column="38"/>
     </issue>
 
@@ -3286,7 +3286,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1316"
+            line="1325"
             column="52"/>
     </issue>
 
@@ -3297,7 +3297,7 @@
         errorLine2="                                  ~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1322"
+            line="1331"
             column="35"/>
     </issue>
 
@@ -3308,7 +3308,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1322"
+            line="1331"
             column="44"/>
     </issue>
 
@@ -3319,7 +3319,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1381"
+            line="1390"
             column="33"/>
     </issue>
 
@@ -3330,7 +3330,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1390"
+            line="1399"
             column="33"/>
     </issue>
 
@@ -3341,7 +3341,7 @@
         errorLine2="                                                     ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1390"
+            line="1399"
             column="54"/>
     </issue>
 
@@ -3352,7 +3352,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1461"
+            line="1470"
             column="36"/>
     </issue>
 
@@ -3363,7 +3363,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1461"
+            line="1470"
             column="51"/>
     </issue>
 
@@ -3374,7 +3374,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1471"
+            line="1480"
             column="36"/>
     </issue>
 
@@ -3385,7 +3385,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1483"
+            line="1492"
             column="36"/>
     </issue>
 
@@ -3396,7 +3396,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1494"
+            line="1503"
             column="39"/>
     </issue>
 
@@ -3407,7 +3407,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1955"
+            line="1964"
             column="23"/>
     </issue>
 
@@ -3418,7 +3418,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1955"
+            line="1964"
             column="39"/>
     </issue>
 
@@ -3429,7 +3429,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1973"
+            line="1982"
             column="23"/>
     </issue>
 
@@ -3440,7 +3440,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1973"
+            line="1982"
             column="39"/>
     </issue>
 
@@ -3451,7 +3451,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1973"
+            line="1982"
             column="53"/>
     </issue>
 
@@ -3462,7 +3462,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="1990"
+            line="1999"
             column="35"/>
     </issue>
 
@@ -3473,7 +3473,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2034"
+            line="2043"
             column="16"/>
     </issue>
 
@@ -3484,7 +3484,7 @@
         errorLine2="               ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2042"
+            line="2051"
             column="16"/>
     </issue>
 
@@ -3495,7 +3495,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2052"
+            line="2061"
             column="36"/>
     </issue>
 
@@ -3506,7 +3506,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2062"
+            line="2071"
             column="16"/>
     </issue>
 
@@ -3517,7 +3517,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2072"
+            line="2081"
             column="38"/>
     </issue>
 
@@ -3528,7 +3528,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2082"
+            line="2091"
             column="16"/>
     </issue>
 
@@ -3539,7 +3539,7 @@
         errorLine2="                      ~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2104"
+            line="2113"
             column="23"/>
     </issue>
 
@@ -3550,7 +3550,7 @@
         errorLine2="                                       ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2104"
+            line="2113"
             column="40"/>
     </issue>
 
@@ -3561,7 +3561,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2159"
+            line="2168"
             column="26"/>
     </issue>
 
@@ -3572,7 +3572,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2186"
+            line="2195"
             column="16"/>
     </issue>
 
@@ -3583,7 +3583,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2198"
+            line="2207"
             column="35"/>
     </issue>
 
@@ -3594,7 +3594,7 @@
         errorLine2="               ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2218"
+            line="2227"
             column="16"/>
     </issue>
 
@@ -3605,7 +3605,7 @@
         errorLine2="                      ~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2238"
+            line="2247"
             column="23"/>
     </issue>
 
@@ -3616,7 +3616,7 @@
         errorLine2="                                              ~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2238"
+            line="2247"
             column="47"/>
     </issue>
 
@@ -3627,7 +3627,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2260"
+            line="2269"
             column="23"/>
     </issue>
 
@@ -3638,7 +3638,7 @@
         errorLine2="                                                        ~~~~~~~">
         <location
             file="src/main/java/android/support/v4/media/session/MediaSessionCompat.java"
-            line="2260"
+            line="2269"
             column="57"/>
     </issue>
 
diff --git a/media2/integration-tests/testapp/src/main/res/values/strings.xml b/media2/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from media2/integration-tests/testapp/src/main/res/values/strings.xml
rename to media2/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/media2/media2-session/lint-baseline.xml b/media2/media2-session/lint-baseline.xml
index 6b6fddb..0b8f1f2 100644
--- a/media2/media2-session/lint-baseline.xml
+++ b/media2/media2-session/lint-baseline.xml
@@ -107,7 +107,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src/main/java/androidx/media2/session/MediaController.java"
-            line="1368"
+            line="1377"
             column="29"/>
     </issue>
 
diff --git a/media2/media2-widget/src/androidTest/res/values/strings.xml b/media2/media2-widget/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from media2/media2-widget/src/androidTest/res/values/strings.xml
rename to media2/media2-widget/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/navigation/integration-tests/testapp/lint-baseline.xml b/navigation/integration-tests/testapp/lint-baseline.xml
index ba442a5..67b445b 100644
--- a/navigation/integration-tests/testapp/lint-baseline.xml
+++ b/navigation/integration-tests/testapp/lint-baseline.xml
@@ -84,7 +84,7 @@
         errorLine1="    &lt;string name=&quot;drawer_navigation&quot;>Drawer Nav&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="16"
             column="13"/>
     </issue>
@@ -95,7 +95,7 @@
         errorLine1="    &lt;string name=&quot;drawer_open&quot;>Open Navigation Drawer&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="17"
             column="13"/>
     </issue>
@@ -106,7 +106,7 @@
         errorLine1="    &lt;string name=&quot;drawer_close&quot;>Close Navigation Drawer&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="18"
             column="13"/>
     </issue>
@@ -117,7 +117,7 @@
         errorLine1="    &lt;string name=&quot;bottom_navigation&quot;>Bottom Nav&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="19"
             column="13"/>
     </issue>
diff --git a/navigation/integration-tests/testapp/src/main/res/values/strings.xml b/navigation/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from navigation/integration-tests/testapp/src/main/res/values/strings.xml
rename to navigation/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/src/main/res/values/strings.xml b/navigation/navigation-compose/integration-tests/navigation-demos/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from navigation/navigation-compose/integration-tests/navigation-demos/src/main/res/values/strings.xml
rename to navigation/navigation-compose/integration-tests/navigation-demos/src/main/res/values/donottranslate-strings.xml
diff --git a/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/src/main/res/values/strings.xml b/navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/src/main/res/values/strings.xml
rename to navigation/navigation-safe-args-gradle-plugin/src/test/test-data/multimodule-project/app/src/main/res/values/donottranslate-strings.xml
diff --git a/paging/integration-tests/testapp/lint-baseline.xml b/paging/integration-tests/testapp/lint-baseline.xml
index db0a0a1..6d2337a 100644
--- a/paging/integration-tests/testapp/lint-baseline.xml
+++ b/paging/integration-tests/testapp/lint-baseline.xml
@@ -7,7 +7,7 @@
         errorLine1="    &lt;string name=&quot;error_occurred&quot;>An error occurred while loading.&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="22"
             column="13"/>
     </issue>
diff --git a/paging/integration-tests/testapp/src/main/res/values/strings.xml b/paging/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from paging/integration-tests/testapp/src/main/res/values/strings.xml
rename to paging/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/room/runtime/lint-baseline.xml b/room/runtime/lint-baseline.xml
index e2490e3..11ef36b 100644
--- a/room/runtime/lint-baseline.xml
+++ b/room/runtime/lint-baseline.xml
@@ -118,7 +118,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="726"
+            line="782"
             column="40"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="170"
+            line="173"
             column="13"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="215"
+            line="219"
             column="13"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="265"
+            line="269"
             column="13"/>
     </issue>
 
@@ -206,7 +206,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="167"
+            line="170"
             column="13"/>
     </issue>
 
@@ -217,7 +217,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="209"
+            line="213"
             column="13"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/DatabaseConfiguration.java"
-            line="257"
+            line="261"
             column="13"/>
     </issue>
 
@@ -701,7 +701,7 @@
         errorLine2="                                            ~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="527"
+            line="523"
             column="45"/>
     </issue>
 
@@ -712,7 +712,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="616"
+            line="612"
             column="16"/>
     </issue>
 
@@ -723,7 +723,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="616"
+            line="612"
             column="43"/>
     </issue>
 
@@ -734,7 +734,7 @@
         errorLine2="                                                               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="616"
+            line="612"
             column="64"/>
     </issue>
 
@@ -745,7 +745,7 @@
         errorLine2="               ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="636"
+            line="632"
             column="16"/>
     </issue>
 
@@ -756,7 +756,7 @@
         errorLine2="                                          ~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="636"
+            line="632"
             column="43"/>
     </issue>
 
@@ -767,7 +767,7 @@
         errorLine2="            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="637"
+            line="633"
             column="13"/>
     </issue>
 
@@ -778,7 +778,7 @@
         errorLine2="                                                       ~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/InvalidationTracker.java"
-            line="745"
+            line="741"
             column="56"/>
     </issue>
 
@@ -811,7 +811,7 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="351"
+            line="392"
             column="65"/>
     </issue>
 
@@ -822,7 +822,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="509"
+            line="565"
             column="12"/>
     </issue>
 
@@ -833,7 +833,7 @@
         errorLine2="               ~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="627"
+            line="683"
             column="16"/>
     </issue>
 
@@ -844,7 +844,7 @@
         errorLine2="                                                             ~~~~~~">
         <location
             file="src/main/java/androidx/room/RoomDatabase.java"
-            line="1195"
+            line="1269"
             column="62"/>
     </issue>
 
diff --git a/room/testing/lint-baseline.xml b/room/testing/lint-baseline.xml
index 2f1c2e0..c419600 100644
--- a/room/testing/lint-baseline.xml
+++ b/room/testing/lint-baseline.xml
@@ -96,7 +96,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="206"
+            line="207"
             column="12"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="206"
+            line="207"
             column="59"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="                                           ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="207"
+            line="208"
             column="44"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                            ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="258"
+            line="260"
             column="29"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="285"
+            line="287"
             column="35"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/room/testing/MigrationTestHelper.java"
-            line="302"
+            line="304"
             column="35"/>
     </issue>
 
diff --git a/samples/Support4Demos/lint-baseline.xml b/samples/Support4Demos/lint-baseline.xml
index 721010f..fb0dc9c 100644
--- a/samples/Support4Demos/lint-baseline.xml
+++ b/samples/Support4Demos/lint-baseline.xml
@@ -107,7 +107,7 @@
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/com/example/android/supportv4/widget/SlidingPaneLayoutActivity.java"
-            line="190"
+            line="205"
             column="54"/>
     </issue>
 
diff --git a/sharetarget/integration-tests/testapp/src/main/res/values/strings.xml b/sharetarget/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from sharetarget/integration-tests/testapp/src/main/res/values/strings.xml
rename to sharetarget/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/slices/view/src/androidTest/res/values/strings.xml b/slices/view/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from slices/view/src/androidTest/res/values/strings.xml
rename to slices/view/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/slidingpanelayout/slidingpanelayout/lint-baseline.xml b/slidingpanelayout/slidingpanelayout/lint-baseline.xml
index ea97ef5..6f8643b 100644
--- a/slidingpanelayout/slidingpanelayout/lint-baseline.xml
+++ b/slidingpanelayout/slidingpanelayout/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="889"
+            line="910"
             column="35"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                              ~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="889"
+            line="910"
             column="47"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="897"
+            line="918"
             column="42"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="957"
+            line="978"
             column="33"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1122"
+            line="1149"
             column="33"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="                                               ~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1122"
+            line="1149"
             column="48"/>
     </issue>
 
@@ -74,7 +74,7 @@
         errorLine2="                                  ~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1280"
+            line="1307"
             column="35"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                     ~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1339"
+            line="1366"
             column="22"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                                ~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1400"
+            line="1427"
             column="33"/>
     </issue>
 
@@ -107,7 +107,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1432"
+            line="1459"
             column="15"/>
     </issue>
 
@@ -118,7 +118,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1437"
+            line="1464"
             column="15"/>
     </issue>
 
@@ -129,7 +129,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1437"
+            line="1464"
             column="59"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1444"
+            line="1471"
             column="41"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1449"
+            line="1476"
             column="12"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1449"
+            line="1476"
             column="56"/>
     </issue>
 
@@ -173,7 +173,7 @@
         errorLine2="              ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1454"
+            line="1481"
             column="15"/>
     </issue>
 
@@ -184,7 +184,7 @@
         errorLine2="                                          ~~~~~~~~~~">
         <location
             file="src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java"
-            line="1464"
+            line="1492"
             column="43"/>
     </issue>
 
diff --git a/startup/integration-tests/test-app/src/main/res/values/strings.xml b/startup/integration-tests/test-app/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from startup/integration-tests/test-app/src/main/res/values/strings.xml
rename to startup/integration-tests/test-app/src/main/res/values/donottranslate-strings.xml
diff --git a/textclassifier/integration-tests/testapp/src/main/res/values/strings.xml b/textclassifier/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from textclassifier/integration-tests/testapp/src/main/res/values/strings.xml
rename to textclassifier/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/transition/transition/src/androidTest/res/values/strings.xml b/transition/transition/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from transition/transition/src/androidTest/res/values/strings.xml
rename to transition/transition/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/vectordrawable/integration-tests/testapp/lint-baseline.xml b/vectordrawable/integration-tests/testapp/lint-baseline.xml
index a1fa69f..b41ff71 100644
--- a/vectordrawable/integration-tests/testapp/lint-baseline.xml
+++ b/vectordrawable/integration-tests/testapp/lint-baseline.xml
@@ -337,7 +337,7 @@
         errorLine1="    &lt;string name=&quot;triangle&quot;> &quot;M300,70 l 0,-70 70,70 0,0   -70,70z&quot;&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="20"
             column="13"/>
     </issue>
@@ -348,7 +348,7 @@
         errorLine1="    &lt;string name=&quot;rectangle&quot;>&quot;M300,70 l 0,-70 70,0  0,140 -70,0 z&quot;&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="21"
             column="13"/>
     </issue>
@@ -359,7 +359,7 @@
         errorLine1="    &lt;string name=&quot;rectangle2&quot;>&quot;M300,70 l 0,-70 70,0  0,70z M300,70  l 70,0 0,70 -70,0z&quot;&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="22"
             column="13"/>
     </issue>
@@ -370,7 +370,7 @@
         errorLine1="    &lt;string name=&quot;equal2&quot;>    &quot;M300,35 l 0,-35 70,0  0,35z M300,105 l 70,0 0,35 -70,0z&quot;&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="23"
             column="13"/>
     </issue>
@@ -381,7 +381,7 @@
         errorLine1="    &lt;string name=&quot;round_box&quot;>&quot;m2.10001,-6c-1.9551,0 -0.5,0.02499 -2.10001,0.02499c-1.575,0 0.0031,-0.02499 -1.95,-0.02499c-2.543,0 -4,2.2816 -4,4.85001c0,3.52929 0.25,6.25 5.95,6.25c5.7,0 6,-2.72071 6,-6.25c0,-2.56841 -1.35699,-4.85001 -3.89999,-4.85001&quot;&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="24"
             column="13"/>
     </issue>
@@ -392,7 +392,7 @@
         errorLine1="    &lt;string name=&quot;heart&quot;>    &quot;m4.5,-7c-1.95509,0 -3.83009,1.26759 -4.5,3c-0.66991,-1.73241 -2.54691,-3 -4.5,-3c-2.543,0 -4.5,1.93159 -4.5,4.5c0,3.5293 3.793,6.2578 9,11.5c5.207,-5.2422 9,-7.9707 9,-11.5c0,-2.56841 -1.957,-4.5 -4.5,-4.5&quot;&lt;/string>"
         errorLine2="            ~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="25"
             column="13"/>
     </issue>
diff --git a/vectordrawable/integration-tests/testapp/src/main/res/values/strings.xml b/vectordrawable/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from vectordrawable/integration-tests/testapp/src/main/res/values/strings.xml
rename to vectordrawable/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/vectordrawable/vectordrawable/src/androidTest/res/values/strings.xml b/vectordrawable/vectordrawable/src/androidTest/res/values/donottranslate-strings.xml
similarity index 100%
rename from vectordrawable/vectordrawable/src/androidTest/res/values/strings.xml
rename to vectordrawable/vectordrawable/src/androidTest/res/values/donottranslate-strings.xml
diff --git a/viewpager2/integration-tests/testapp/src/main/res/values/strings.xml b/viewpager2/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from viewpager2/integration-tests/testapp/src/main/res/values/strings.xml
rename to viewpager2/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/wear/tiles/tiles-proto/lint-baseline.xml b/wear/tiles/tiles-proto/lint-baseline.xml
index 6f2b4e4..2999513 100644
--- a/wear/tiles/tiles-proto/lint-baseline.xml
+++ b/wear/tiles/tiles-proto/lint-baseline.xml
@@ -7906,7 +7906,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="388"
+            line="356"
             column="19"/>
     </issue>
 
@@ -7917,7 +7917,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="389"
+            line="357"
             column="9"/>
     </issue>
 
@@ -7928,6 +7928,149 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="362"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        java.nio.ByteBuffer data,"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="363"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="364"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="369"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        com.google.protobuf.ByteString data)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="370"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="375"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        com.google.protobuf.ByteString data,"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="376"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="377"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(byte[] data)"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="382"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(byte[] data)"
+        errorLine2="                                                                            ~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="382"
+            column="77"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="387"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        byte[] data,"
+        errorLine2="        ~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="388"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
+            line="389"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(java.io.InputStream input)"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
             line="394"
             column="19"/>
     </issue>
@@ -7935,154 +8078,11 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        java.nio.ByteBuffer data,"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="395"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="396"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="401"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ByteString data)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="402"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="407"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ByteString data,"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="408"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="409"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(byte[] data)"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="414"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(byte[] data)"
-        errorLine2="                                                                            ~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="414"
-            column="77"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom("
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="419"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        byte[] data,"
-        errorLine2="        ~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="420"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        com.google.protobuf.ExtensionRegistryLite extensionRegistry)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="421"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(java.io.InputStream input)"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="426"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="    public static androidx.wear.tiles.proto.DimensionProto.SpProp parseFrom(java.io.InputStream input)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="426"
+            line="394"
             column="77"/>
     </issue>
 
@@ -8093,7 +8093,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="431"
+            line="399"
             column="19"/>
     </issue>
 
@@ -8104,7 +8104,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="432"
+            line="400"
             column="9"/>
     </issue>
 
@@ -8115,7 +8115,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="433"
+            line="401"
             column="9"/>
     </issue>
 
@@ -8126,7 +8126,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="438"
+            line="406"
             column="19"/>
     </issue>
 
@@ -8137,7 +8137,7 @@
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="438"
+            line="406"
             column="86"/>
     </issue>
 
@@ -8148,7 +8148,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="442"
+            line="410"
             column="19"/>
     </issue>
 
@@ -8159,7 +8159,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="443"
+            line="411"
             column="9"/>
     </issue>
 
@@ -8170,7 +8170,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="444"
+            line="412"
             column="9"/>
     </issue>
 
@@ -8181,7 +8181,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="448"
+            line="416"
             column="19"/>
     </issue>
 
@@ -8192,7 +8192,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="449"
+            line="417"
             column="9"/>
     </issue>
 
@@ -8203,7 +8203,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="454"
+            line="422"
             column="19"/>
     </issue>
 
@@ -8214,7 +8214,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="455"
+            line="423"
             column="9"/>
     </issue>
 
@@ -8225,7 +8225,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="456"
+            line="424"
             column="9"/>
     </issue>
 
@@ -8236,7 +8236,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="462"
+            line="430"
             column="19"/>
     </issue>
 
@@ -8247,7 +8247,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="465"
+            line="433"
             column="19"/>
     </issue>
 
@@ -8258,40 +8258,18 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="465"
+            line="433"
             column="38"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder setDeprecatedIntValue(int value) {"
-        errorLine2="             ~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="500"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      public Builder clearDeprecatedIntValue() {"
-        errorLine2="             ~~~~~~~">
-        <location
-            file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="509"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
         errorLine1="      public Builder setValue(float value) {"
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="536"
+            line="476"
             column="14"/>
     </issue>
 
@@ -8302,7 +8280,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="549"
+            line="489"
             column="14"/>
     </issue>
 
@@ -8313,7 +8291,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="559"
+            line="499"
             column="21"/>
     </issue>
 
@@ -8324,7 +8302,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="560"
+            line="500"
             column="9"/>
     </issue>
 
@@ -8335,7 +8313,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="561"
+            line="501"
             column="9"/>
     </issue>
 
@@ -8346,7 +8324,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="561"
+            line="501"
             column="32"/>
     </issue>
 
@@ -8357,7 +8335,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="620"
+            line="558"
             column="19"/>
     </issue>
 
@@ -8368,7 +8346,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="626"
+            line="564"
             column="19"/>
     </issue>
 
@@ -8379,7 +8357,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="697"
+            line="635"
             column="19"/>
     </issue>
 
@@ -8390,7 +8368,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="698"
+            line="636"
             column="9"/>
     </issue>
 
@@ -8401,7 +8379,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="703"
+            line="641"
             column="19"/>
     </issue>
 
@@ -8412,7 +8390,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="704"
+            line="642"
             column="9"/>
     </issue>
 
@@ -8423,7 +8401,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="705"
+            line="643"
             column="9"/>
     </issue>
 
@@ -8434,7 +8412,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="710"
+            line="648"
             column="19"/>
     </issue>
 
@@ -8445,7 +8423,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="711"
+            line="649"
             column="9"/>
     </issue>
 
@@ -8456,7 +8434,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="716"
+            line="654"
             column="19"/>
     </issue>
 
@@ -8467,7 +8445,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="717"
+            line="655"
             column="9"/>
     </issue>
 
@@ -8478,7 +8456,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="718"
+            line="656"
             column="9"/>
     </issue>
 
@@ -8489,7 +8467,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="723"
+            line="661"
             column="19"/>
     </issue>
 
@@ -8500,7 +8478,7 @@
         errorLine2="                                                                            ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="723"
+            line="661"
             column="77"/>
     </issue>
 
@@ -8511,7 +8489,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="728"
+            line="666"
             column="19"/>
     </issue>
 
@@ -8522,7 +8500,7 @@
         errorLine2="        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="729"
+            line="667"
             column="9"/>
     </issue>
 
@@ -8533,7 +8511,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="730"
+            line="668"
             column="9"/>
     </issue>
 
@@ -8544,7 +8522,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="735"
+            line="673"
             column="19"/>
     </issue>
 
@@ -8555,7 +8533,7 @@
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="735"
+            line="673"
             column="77"/>
     </issue>
 
@@ -8566,7 +8544,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="740"
+            line="678"
             column="19"/>
     </issue>
 
@@ -8577,7 +8555,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="741"
+            line="679"
             column="9"/>
     </issue>
 
@@ -8588,7 +8566,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="742"
+            line="680"
             column="9"/>
     </issue>
 
@@ -8599,7 +8577,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="747"
+            line="685"
             column="19"/>
     </issue>
 
@@ -8610,7 +8588,7 @@
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="747"
+            line="685"
             column="86"/>
     </issue>
 
@@ -8621,7 +8599,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="751"
+            line="689"
             column="19"/>
     </issue>
 
@@ -8632,7 +8610,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="752"
+            line="690"
             column="9"/>
     </issue>
 
@@ -8643,7 +8621,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="753"
+            line="691"
             column="9"/>
     </issue>
 
@@ -8654,7 +8632,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="757"
+            line="695"
             column="19"/>
     </issue>
 
@@ -8665,7 +8643,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="758"
+            line="696"
             column="9"/>
     </issue>
 
@@ -8676,7 +8654,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="763"
+            line="701"
             column="19"/>
     </issue>
 
@@ -8687,7 +8665,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="764"
+            line="702"
             column="9"/>
     </issue>
 
@@ -8698,7 +8676,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="765"
+            line="703"
             column="9"/>
     </issue>
 
@@ -8709,7 +8687,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="771"
+            line="709"
             column="19"/>
     </issue>
 
@@ -8720,7 +8698,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="774"
+            line="712"
             column="19"/>
     </issue>
 
@@ -8731,7 +8709,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="774"
+            line="712"
             column="38"/>
     </issue>
 
@@ -8742,7 +8720,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="817"
+            line="755"
             column="14"/>
     </issue>
 
@@ -8753,7 +8731,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="830"
+            line="768"
             column="14"/>
     </issue>
 
@@ -8764,7 +8742,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="840"
+            line="778"
             column="21"/>
     </issue>
 
@@ -8775,7 +8753,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="841"
+            line="779"
             column="9"/>
     </issue>
 
@@ -8786,7 +8764,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="842"
+            line="780"
             column="9"/>
     </issue>
 
@@ -8797,7 +8775,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="842"
+            line="780"
             column="32"/>
     </issue>
 
@@ -8808,7 +8786,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="899"
+            line="837"
             column="19"/>
     </issue>
 
@@ -8819,7 +8797,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="905"
+            line="843"
             column="19"/>
     </issue>
 
@@ -8830,7 +8808,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="976"
+            line="914"
             column="19"/>
     </issue>
 
@@ -8841,7 +8819,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="977"
+            line="915"
             column="9"/>
     </issue>
 
@@ -8852,7 +8830,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="982"
+            line="920"
             column="19"/>
     </issue>
 
@@ -8863,7 +8841,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="983"
+            line="921"
             column="9"/>
     </issue>
 
@@ -8874,7 +8852,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="984"
+            line="922"
             column="9"/>
     </issue>
 
@@ -8885,7 +8863,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="989"
+            line="927"
             column="19"/>
     </issue>
 
@@ -8896,7 +8874,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="990"
+            line="928"
             column="9"/>
     </issue>
 
@@ -8907,7 +8885,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="995"
+            line="933"
             column="19"/>
     </issue>
 
@@ -8918,7 +8896,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="996"
+            line="934"
             column="9"/>
     </issue>
 
@@ -8929,7 +8907,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="997"
+            line="935"
             column="9"/>
     </issue>
 
@@ -8940,7 +8918,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1002"
+            line="940"
             column="19"/>
     </issue>
 
@@ -8951,7 +8929,7 @@
         errorLine2="                                                                                 ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1002"
+            line="940"
             column="82"/>
     </issue>
 
@@ -8962,7 +8940,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1007"
+            line="945"
             column="19"/>
     </issue>
 
@@ -8973,7 +8951,7 @@
         errorLine2="        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1008"
+            line="946"
             column="9"/>
     </issue>
 
@@ -8984,7 +8962,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1009"
+            line="947"
             column="9"/>
     </issue>
 
@@ -8995,7 +8973,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1014"
+            line="952"
             column="19"/>
     </issue>
 
@@ -9006,7 +8984,7 @@
         errorLine2="                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1014"
+            line="952"
             column="82"/>
     </issue>
 
@@ -9017,7 +8995,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1019"
+            line="957"
             column="19"/>
     </issue>
 
@@ -9028,7 +9006,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1020"
+            line="958"
             column="9"/>
     </issue>
 
@@ -9039,7 +9017,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1021"
+            line="959"
             column="9"/>
     </issue>
 
@@ -9050,7 +9028,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1026"
+            line="964"
             column="19"/>
     </issue>
 
@@ -9061,7 +9039,7 @@
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1026"
+            line="964"
             column="91"/>
     </issue>
 
@@ -9072,7 +9050,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1030"
+            line="968"
             column="19"/>
     </issue>
 
@@ -9083,7 +9061,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1031"
+            line="969"
             column="9"/>
     </issue>
 
@@ -9094,7 +9072,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1032"
+            line="970"
             column="9"/>
     </issue>
 
@@ -9105,7 +9083,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1036"
+            line="974"
             column="19"/>
     </issue>
 
@@ -9116,7 +9094,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1037"
+            line="975"
             column="9"/>
     </issue>
 
@@ -9127,7 +9105,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1042"
+            line="980"
             column="19"/>
     </issue>
 
@@ -9138,7 +9116,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1043"
+            line="981"
             column="9"/>
     </issue>
 
@@ -9149,7 +9127,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1044"
+            line="982"
             column="9"/>
     </issue>
 
@@ -9160,7 +9138,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1050"
+            line="988"
             column="19"/>
     </issue>
 
@@ -9171,7 +9149,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1053"
+            line="991"
             column="19"/>
     </issue>
 
@@ -9182,7 +9160,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1053"
+            line="991"
             column="38"/>
     </issue>
 
@@ -9193,7 +9171,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1096"
+            line="1034"
             column="14"/>
     </issue>
 
@@ -9204,7 +9182,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1109"
+            line="1047"
             column="14"/>
     </issue>
 
@@ -9215,7 +9193,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1119"
+            line="1057"
             column="21"/>
     </issue>
 
@@ -9226,7 +9204,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1120"
+            line="1058"
             column="9"/>
     </issue>
 
@@ -9237,7 +9215,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1121"
+            line="1059"
             column="9"/>
     </issue>
 
@@ -9248,7 +9226,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1121"
+            line="1059"
             column="32"/>
     </issue>
 
@@ -9259,7 +9237,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1178"
+            line="1116"
             column="19"/>
     </issue>
 
@@ -9270,7 +9248,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1184"
+            line="1122"
             column="19"/>
     </issue>
 
@@ -9281,7 +9259,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1208"
+            line="1146"
             column="19"/>
     </issue>
 
@@ -9292,7 +9270,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1209"
+            line="1147"
             column="9"/>
     </issue>
 
@@ -9303,7 +9281,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1214"
+            line="1152"
             column="19"/>
     </issue>
 
@@ -9314,7 +9292,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1215"
+            line="1153"
             column="9"/>
     </issue>
 
@@ -9325,7 +9303,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1216"
+            line="1154"
             column="9"/>
     </issue>
 
@@ -9336,7 +9314,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1221"
+            line="1159"
             column="19"/>
     </issue>
 
@@ -9347,7 +9325,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1222"
+            line="1160"
             column="9"/>
     </issue>
 
@@ -9358,7 +9336,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1227"
+            line="1165"
             column="19"/>
     </issue>
 
@@ -9369,7 +9347,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1228"
+            line="1166"
             column="9"/>
     </issue>
 
@@ -9380,7 +9358,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1229"
+            line="1167"
             column="9"/>
     </issue>
 
@@ -9391,7 +9369,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1234"
+            line="1172"
             column="19"/>
     </issue>
 
@@ -9402,7 +9380,7 @@
         errorLine2="                                                                                           ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1234"
+            line="1172"
             column="92"/>
     </issue>
 
@@ -9413,7 +9391,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1239"
+            line="1177"
             column="19"/>
     </issue>
 
@@ -9424,7 +9402,7 @@
         errorLine2="        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1240"
+            line="1178"
             column="9"/>
     </issue>
 
@@ -9435,7 +9413,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1241"
+            line="1179"
             column="9"/>
     </issue>
 
@@ -9446,7 +9424,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1246"
+            line="1184"
             column="19"/>
     </issue>
 
@@ -9457,7 +9435,7 @@
         errorLine2="                                                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1246"
+            line="1184"
             column="92"/>
     </issue>
 
@@ -9468,7 +9446,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1251"
+            line="1189"
             column="19"/>
     </issue>
 
@@ -9479,7 +9457,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1252"
+            line="1190"
             column="9"/>
     </issue>
 
@@ -9490,7 +9468,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1253"
+            line="1191"
             column="9"/>
     </issue>
 
@@ -9501,7 +9479,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1258"
+            line="1196"
             column="19"/>
     </issue>
 
@@ -9512,7 +9490,7 @@
         errorLine2="                                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1258"
+            line="1196"
             column="101"/>
     </issue>
 
@@ -9523,7 +9501,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1262"
+            line="1200"
             column="19"/>
     </issue>
 
@@ -9534,7 +9512,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1263"
+            line="1201"
             column="9"/>
     </issue>
 
@@ -9545,7 +9523,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1264"
+            line="1202"
             column="9"/>
     </issue>
 
@@ -9556,7 +9534,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1268"
+            line="1206"
             column="19"/>
     </issue>
 
@@ -9567,7 +9545,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1269"
+            line="1207"
             column="9"/>
     </issue>
 
@@ -9578,7 +9556,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1274"
+            line="1212"
             column="19"/>
     </issue>
 
@@ -9589,7 +9567,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1275"
+            line="1213"
             column="9"/>
     </issue>
 
@@ -9600,7 +9578,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1276"
+            line="1214"
             column="9"/>
     </issue>
 
@@ -9611,7 +9589,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1282"
+            line="1220"
             column="19"/>
     </issue>
 
@@ -9622,7 +9600,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1285"
+            line="1223"
             column="19"/>
     </issue>
 
@@ -9633,7 +9611,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1285"
+            line="1223"
             column="38"/>
     </issue>
 
@@ -9644,7 +9622,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1312"
+            line="1250"
             column="21"/>
     </issue>
 
@@ -9655,7 +9633,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1313"
+            line="1251"
             column="9"/>
     </issue>
 
@@ -9666,7 +9644,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1314"
+            line="1252"
             column="9"/>
     </issue>
 
@@ -9677,7 +9655,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1314"
+            line="1252"
             column="32"/>
     </issue>
 
@@ -9688,7 +9666,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1368"
+            line="1306"
             column="19"/>
     </issue>
 
@@ -9699,7 +9677,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1374"
+            line="1312"
             column="19"/>
     </issue>
 
@@ -9710,7 +9688,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1398"
+            line="1336"
             column="19"/>
     </issue>
 
@@ -9721,7 +9699,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1399"
+            line="1337"
             column="9"/>
     </issue>
 
@@ -9732,7 +9710,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1404"
+            line="1342"
             column="19"/>
     </issue>
 
@@ -9743,7 +9721,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1405"
+            line="1343"
             column="9"/>
     </issue>
 
@@ -9754,7 +9732,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1406"
+            line="1344"
             column="9"/>
     </issue>
 
@@ -9765,7 +9743,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1411"
+            line="1349"
             column="19"/>
     </issue>
 
@@ -9776,7 +9754,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1412"
+            line="1350"
             column="9"/>
     </issue>
 
@@ -9787,7 +9765,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1417"
+            line="1355"
             column="19"/>
     </issue>
 
@@ -9798,7 +9776,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1418"
+            line="1356"
             column="9"/>
     </issue>
 
@@ -9809,7 +9787,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1419"
+            line="1357"
             column="9"/>
     </issue>
 
@@ -9820,7 +9798,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1424"
+            line="1362"
             column="19"/>
     </issue>
 
@@ -9831,7 +9809,7 @@
         errorLine2="                                                                                          ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1424"
+            line="1362"
             column="91"/>
     </issue>
 
@@ -9842,7 +9820,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1429"
+            line="1367"
             column="19"/>
     </issue>
 
@@ -9853,7 +9831,7 @@
         errorLine2="        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1430"
+            line="1368"
             column="9"/>
     </issue>
 
@@ -9864,7 +9842,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1431"
+            line="1369"
             column="9"/>
     </issue>
 
@@ -9875,7 +9853,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1436"
+            line="1374"
             column="19"/>
     </issue>
 
@@ -9886,7 +9864,7 @@
         errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1436"
+            line="1374"
             column="91"/>
     </issue>
 
@@ -9897,7 +9875,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1441"
+            line="1379"
             column="19"/>
     </issue>
 
@@ -9908,7 +9886,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1442"
+            line="1380"
             column="9"/>
     </issue>
 
@@ -9919,7 +9897,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1443"
+            line="1381"
             column="9"/>
     </issue>
 
@@ -9930,7 +9908,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1448"
+            line="1386"
             column="19"/>
     </issue>
 
@@ -9941,7 +9919,7 @@
         errorLine2="                                                                                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1448"
+            line="1386"
             column="100"/>
     </issue>
 
@@ -9952,7 +9930,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1452"
+            line="1390"
             column="19"/>
     </issue>
 
@@ -9963,7 +9941,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1453"
+            line="1391"
             column="9"/>
     </issue>
 
@@ -9974,7 +9952,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1454"
+            line="1392"
             column="9"/>
     </issue>
 
@@ -9985,7 +9963,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1458"
+            line="1396"
             column="19"/>
     </issue>
 
@@ -9996,7 +9974,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1459"
+            line="1397"
             column="9"/>
     </issue>
 
@@ -10007,7 +9985,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1464"
+            line="1402"
             column="19"/>
     </issue>
 
@@ -10018,7 +9996,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1465"
+            line="1403"
             column="9"/>
     </issue>
 
@@ -10029,7 +10007,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1466"
+            line="1404"
             column="9"/>
     </issue>
 
@@ -10040,7 +10018,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1472"
+            line="1410"
             column="19"/>
     </issue>
 
@@ -10051,7 +10029,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1475"
+            line="1413"
             column="19"/>
     </issue>
 
@@ -10062,7 +10040,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1475"
+            line="1413"
             column="38"/>
     </issue>
 
@@ -10073,7 +10051,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1502"
+            line="1440"
             column="21"/>
     </issue>
 
@@ -10084,7 +10062,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1503"
+            line="1441"
             column="9"/>
     </issue>
 
@@ -10095,7 +10073,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1504"
+            line="1442"
             column="9"/>
     </issue>
 
@@ -10106,7 +10084,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1504"
+            line="1442"
             column="32"/>
     </issue>
 
@@ -10117,7 +10095,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1558"
+            line="1496"
             column="19"/>
     </issue>
 
@@ -10128,7 +10106,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1564"
+            line="1502"
             column="19"/>
     </issue>
 
@@ -10139,7 +10117,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1690"
+            line="1628"
             column="19"/>
     </issue>
 
@@ -10150,7 +10128,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1691"
+            line="1629"
             column="9"/>
     </issue>
 
@@ -10161,7 +10139,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1696"
+            line="1634"
             column="19"/>
     </issue>
 
@@ -10172,7 +10150,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1697"
+            line="1635"
             column="9"/>
     </issue>
 
@@ -10183,7 +10161,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1698"
+            line="1636"
             column="9"/>
     </issue>
 
@@ -10194,7 +10172,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1703"
+            line="1641"
             column="19"/>
     </issue>
 
@@ -10205,7 +10183,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1704"
+            line="1642"
             column="9"/>
     </issue>
 
@@ -10216,7 +10194,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1709"
+            line="1647"
             column="19"/>
     </issue>
 
@@ -10227,7 +10205,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1710"
+            line="1648"
             column="9"/>
     </issue>
 
@@ -10238,7 +10216,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1711"
+            line="1649"
             column="9"/>
     </issue>
 
@@ -10249,7 +10227,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1716"
+            line="1654"
             column="19"/>
     </issue>
 
@@ -10260,7 +10238,7 @@
         errorLine2="                                                                                               ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1716"
+            line="1654"
             column="96"/>
     </issue>
 
@@ -10271,7 +10249,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1721"
+            line="1659"
             column="19"/>
     </issue>
 
@@ -10282,7 +10260,7 @@
         errorLine2="        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1722"
+            line="1660"
             column="9"/>
     </issue>
 
@@ -10293,7 +10271,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1723"
+            line="1661"
             column="9"/>
     </issue>
 
@@ -10304,7 +10282,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1728"
+            line="1666"
             column="19"/>
     </issue>
 
@@ -10315,7 +10293,7 @@
         errorLine2="                                                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1728"
+            line="1666"
             column="96"/>
     </issue>
 
@@ -10326,7 +10304,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1733"
+            line="1671"
             column="19"/>
     </issue>
 
@@ -10337,7 +10315,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1734"
+            line="1672"
             column="9"/>
     </issue>
 
@@ -10348,7 +10326,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1735"
+            line="1673"
             column="9"/>
     </issue>
 
@@ -10359,7 +10337,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1740"
+            line="1678"
             column="19"/>
     </issue>
 
@@ -10370,7 +10348,7 @@
         errorLine2="                                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1740"
+            line="1678"
             column="105"/>
     </issue>
 
@@ -10381,7 +10359,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1744"
+            line="1682"
             column="19"/>
     </issue>
 
@@ -10392,7 +10370,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1745"
+            line="1683"
             column="9"/>
     </issue>
 
@@ -10403,7 +10381,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1746"
+            line="1684"
             column="9"/>
     </issue>
 
@@ -10414,7 +10392,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1750"
+            line="1688"
             column="19"/>
     </issue>
 
@@ -10425,7 +10403,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1751"
+            line="1689"
             column="9"/>
     </issue>
 
@@ -10436,7 +10414,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1756"
+            line="1694"
             column="19"/>
     </issue>
 
@@ -10447,7 +10425,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1757"
+            line="1695"
             column="9"/>
     </issue>
 
@@ -10458,7 +10436,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1758"
+            line="1696"
             column="9"/>
     </issue>
 
@@ -10469,7 +10447,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1764"
+            line="1702"
             column="19"/>
     </issue>
 
@@ -10480,7 +10458,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1767"
+            line="1705"
             column="19"/>
     </issue>
 
@@ -10491,7 +10469,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1767"
+            line="1705"
             column="38"/>
     </issue>
 
@@ -10502,7 +10480,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1817"
+            line="1755"
             column="14"/>
     </issue>
 
@@ -10513,7 +10491,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1830"
+            line="1768"
             column="14"/>
     </issue>
 
@@ -10524,7 +10502,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1857"
+            line="1795"
             column="14"/>
     </issue>
 
@@ -10535,7 +10513,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1870"
+            line="1808"
             column="14"/>
     </issue>
 
@@ -10546,7 +10524,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1880"
+            line="1818"
             column="21"/>
     </issue>
 
@@ -10557,7 +10535,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1881"
+            line="1819"
             column="9"/>
     </issue>
 
@@ -10568,7 +10546,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1882"
+            line="1820"
             column="9"/>
     </issue>
 
@@ -10579,7 +10557,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1882"
+            line="1820"
             column="32"/>
     </issue>
 
@@ -10590,7 +10568,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1941"
+            line="1879"
             column="19"/>
     </issue>
 
@@ -10601,7 +10579,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1947"
+            line="1885"
             column="19"/>
     </issue>
 
@@ -10612,7 +10590,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1965"
+            line="1903"
             column="5"/>
     </issue>
 
@@ -10623,7 +10601,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1976"
+            line="1914"
             column="5"/>
     </issue>
 
@@ -10634,7 +10612,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1987"
+            line="1925"
             column="5"/>
     </issue>
 
@@ -10645,7 +10623,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="1989"
+            line="1927"
             column="12"/>
     </issue>
 
@@ -10656,7 +10634,7 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2020"
+            line="1958"
             column="21"/>
     </issue>
 
@@ -10667,7 +10645,7 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2024"
+            line="1962"
             column="21"/>
     </issue>
 
@@ -10678,7 +10656,7 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2039"
+            line="1977"
             column="12"/>
     </issue>
 
@@ -10689,7 +10667,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2062"
+            line="2000"
             column="12"/>
     </issue>
 
@@ -10700,7 +10678,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2124"
+            line="2062"
             column="12"/>
     </issue>
 
@@ -10711,7 +10689,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2186"
+            line="2124"
             column="12"/>
     </issue>
 
@@ -10722,7 +10700,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2236"
+            line="2174"
             column="19"/>
     </issue>
 
@@ -10733,7 +10711,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2237"
+            line="2175"
             column="9"/>
     </issue>
 
@@ -10744,7 +10722,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2242"
+            line="2180"
             column="19"/>
     </issue>
 
@@ -10755,7 +10733,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2243"
+            line="2181"
             column="9"/>
     </issue>
 
@@ -10766,7 +10744,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2244"
+            line="2182"
             column="9"/>
     </issue>
 
@@ -10777,7 +10755,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2249"
+            line="2187"
             column="19"/>
     </issue>
 
@@ -10788,7 +10766,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2250"
+            line="2188"
             column="9"/>
     </issue>
 
@@ -10799,7 +10777,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2255"
+            line="2193"
             column="19"/>
     </issue>
 
@@ -10810,7 +10788,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2256"
+            line="2194"
             column="9"/>
     </issue>
 
@@ -10821,7 +10799,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2257"
+            line="2195"
             column="9"/>
     </issue>
 
@@ -10832,7 +10810,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2262"
+            line="2200"
             column="19"/>
     </issue>
 
@@ -10843,7 +10821,7 @@
         errorLine2="                                                                                        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2262"
+            line="2200"
             column="89"/>
     </issue>
 
@@ -10854,7 +10832,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2267"
+            line="2205"
             column="19"/>
     </issue>
 
@@ -10865,7 +10843,7 @@
         errorLine2="        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2268"
+            line="2206"
             column="9"/>
     </issue>
 
@@ -10876,7 +10854,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2269"
+            line="2207"
             column="9"/>
     </issue>
 
@@ -10887,7 +10865,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2274"
+            line="2212"
             column="19"/>
     </issue>
 
@@ -10898,7 +10876,7 @@
         errorLine2="                                                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2274"
+            line="2212"
             column="89"/>
     </issue>
 
@@ -10909,7 +10887,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2279"
+            line="2217"
             column="19"/>
     </issue>
 
@@ -10920,7 +10898,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2280"
+            line="2218"
             column="9"/>
     </issue>
 
@@ -10931,7 +10909,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2281"
+            line="2219"
             column="9"/>
     </issue>
 
@@ -10942,7 +10920,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2286"
+            line="2224"
             column="19"/>
     </issue>
 
@@ -10953,7 +10931,7 @@
         errorLine2="                                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2286"
+            line="2224"
             column="98"/>
     </issue>
 
@@ -10964,7 +10942,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2290"
+            line="2228"
             column="19"/>
     </issue>
 
@@ -10975,7 +10953,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2291"
+            line="2229"
             column="9"/>
     </issue>
 
@@ -10986,7 +10964,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2292"
+            line="2230"
             column="9"/>
     </issue>
 
@@ -10997,7 +10975,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2296"
+            line="2234"
             column="19"/>
     </issue>
 
@@ -11008,7 +10986,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2297"
+            line="2235"
             column="9"/>
     </issue>
 
@@ -11019,7 +10997,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2302"
+            line="2240"
             column="19"/>
     </issue>
 
@@ -11030,7 +11008,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2303"
+            line="2241"
             column="9"/>
     </issue>
 
@@ -11041,7 +11019,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2304"
+            line="2242"
             column="9"/>
     </issue>
 
@@ -11052,7 +11030,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2310"
+            line="2248"
             column="19"/>
     </issue>
 
@@ -11063,7 +11041,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2313"
+            line="2251"
             column="19"/>
     </issue>
 
@@ -11074,7 +11052,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2313"
+            line="2251"
             column="38"/>
     </issue>
 
@@ -11085,7 +11063,7 @@
         errorLine2="             ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2335"
+            line="2273"
             column="14"/>
     </issue>
 
@@ -11096,7 +11074,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2340"
+            line="2278"
             column="14"/>
     </issue>
 
@@ -11107,7 +11085,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2358"
+            line="2296"
             column="14"/>
     </issue>
 
@@ -11118,7 +11096,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2364"
+            line="2302"
             column="14"/>
     </issue>
 
@@ -11129,7 +11107,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2364"
+            line="2302"
             column="41"/>
     </issue>
 
@@ -11140,7 +11118,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2372"
+            line="2310"
             column="14"/>
     </issue>
 
@@ -11151,7 +11129,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2373"
+            line="2311"
             column="11"/>
     </issue>
 
@@ -11162,7 +11140,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2381"
+            line="2319"
             column="14"/>
     </issue>
 
@@ -11173,7 +11151,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2381"
+            line="2319"
             column="43"/>
     </issue>
 
@@ -11184,7 +11162,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2389"
+            line="2327"
             column="14"/>
     </issue>
 
@@ -11195,7 +11173,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2406"
+            line="2344"
             column="14"/>
     </issue>
 
@@ -11206,7 +11184,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2412"
+            line="2350"
             column="14"/>
     </issue>
 
@@ -11217,7 +11195,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2412"
+            line="2350"
             column="43"/>
     </issue>
 
@@ -11228,7 +11206,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2420"
+            line="2358"
             column="14"/>
     </issue>
 
@@ -11239,7 +11217,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2421"
+            line="2359"
             column="11"/>
     </issue>
 
@@ -11250,7 +11228,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2429"
+            line="2367"
             column="14"/>
     </issue>
 
@@ -11261,7 +11239,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2429"
+            line="2367"
             column="45"/>
     </issue>
 
@@ -11272,7 +11250,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2437"
+            line="2375"
             column="14"/>
     </issue>
 
@@ -11283,7 +11261,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2454"
+            line="2392"
             column="14"/>
     </issue>
 
@@ -11294,7 +11272,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2460"
+            line="2398"
             column="14"/>
     </issue>
 
@@ -11305,7 +11283,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2460"
+            line="2398"
             column="42"/>
     </issue>
 
@@ -11316,7 +11294,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2468"
+            line="2406"
             column="14"/>
     </issue>
 
@@ -11327,7 +11305,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2469"
+            line="2407"
             column="11"/>
     </issue>
 
@@ -11338,7 +11316,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2477"
+            line="2415"
             column="14"/>
     </issue>
 
@@ -11349,7 +11327,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2477"
+            line="2415"
             column="44"/>
     </issue>
 
@@ -11360,7 +11338,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2485"
+            line="2423"
             column="14"/>
     </issue>
 
@@ -11371,7 +11349,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2495"
+            line="2433"
             column="21"/>
     </issue>
 
@@ -11382,7 +11360,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2496"
+            line="2434"
             column="9"/>
     </issue>
 
@@ -11393,7 +11371,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2497"
+            line="2435"
             column="9"/>
     </issue>
 
@@ -11404,7 +11382,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2497"
+            line="2435"
             column="32"/>
     </issue>
 
@@ -11415,7 +11393,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2559"
+            line="2497"
             column="19"/>
     </issue>
 
@@ -11426,7 +11404,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2565"
+            line="2503"
             column="19"/>
     </issue>
 
@@ -11437,7 +11415,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2583"
+            line="2521"
             column="5"/>
     </issue>
 
@@ -11448,7 +11426,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2594"
+            line="2532"
             column="5"/>
     </issue>
 
@@ -11459,7 +11437,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2605"
+            line="2543"
             column="5"/>
     </issue>
 
@@ -11470,7 +11448,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2607"
+            line="2545"
             column="12"/>
     </issue>
 
@@ -11481,7 +11459,7 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2638"
+            line="2576"
             column="21"/>
     </issue>
 
@@ -11492,7 +11470,7 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2642"
+            line="2580"
             column="21"/>
     </issue>
 
@@ -11503,7 +11481,7 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2657"
+            line="2595"
             column="12"/>
     </issue>
 
@@ -11514,7 +11492,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2680"
+            line="2618"
             column="12"/>
     </issue>
 
@@ -11525,7 +11503,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2742"
+            line="2680"
             column="12"/>
     </issue>
 
@@ -11536,7 +11514,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2804"
+            line="2742"
             column="12"/>
     </issue>
 
@@ -11547,7 +11525,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2854"
+            line="2792"
             column="19"/>
     </issue>
 
@@ -11558,7 +11536,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2855"
+            line="2793"
             column="9"/>
     </issue>
 
@@ -11569,7 +11547,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2860"
+            line="2798"
             column="19"/>
     </issue>
 
@@ -11580,7 +11558,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2861"
+            line="2799"
             column="9"/>
     </issue>
 
@@ -11591,7 +11569,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2862"
+            line="2800"
             column="9"/>
     </issue>
 
@@ -11602,7 +11580,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2867"
+            line="2805"
             column="19"/>
     </issue>
 
@@ -11613,7 +11591,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2868"
+            line="2806"
             column="9"/>
     </issue>
 
@@ -11624,7 +11602,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2873"
+            line="2811"
             column="19"/>
     </issue>
 
@@ -11635,7 +11613,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2874"
+            line="2812"
             column="9"/>
     </issue>
 
@@ -11646,7 +11624,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2875"
+            line="2813"
             column="9"/>
     </issue>
 
@@ -11657,7 +11635,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2880"
+            line="2818"
             column="19"/>
     </issue>
 
@@ -11668,7 +11646,7 @@
         errorLine2="                                                                                    ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2880"
+            line="2818"
             column="85"/>
     </issue>
 
@@ -11679,7 +11657,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2885"
+            line="2823"
             column="19"/>
     </issue>
 
@@ -11690,7 +11668,7 @@
         errorLine2="        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2886"
+            line="2824"
             column="9"/>
     </issue>
 
@@ -11701,7 +11679,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2887"
+            line="2825"
             column="9"/>
     </issue>
 
@@ -11712,7 +11690,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2892"
+            line="2830"
             column="19"/>
     </issue>
 
@@ -11723,7 +11701,7 @@
         errorLine2="                                                                                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2892"
+            line="2830"
             column="85"/>
     </issue>
 
@@ -11734,7 +11712,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2897"
+            line="2835"
             column="19"/>
     </issue>
 
@@ -11745,7 +11723,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2898"
+            line="2836"
             column="9"/>
     </issue>
 
@@ -11756,7 +11734,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2899"
+            line="2837"
             column="9"/>
     </issue>
 
@@ -11767,7 +11745,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2904"
+            line="2842"
             column="19"/>
     </issue>
 
@@ -11778,7 +11756,7 @@
         errorLine2="                                                                                             ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2904"
+            line="2842"
             column="94"/>
     </issue>
 
@@ -11789,7 +11767,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2908"
+            line="2846"
             column="19"/>
     </issue>
 
@@ -11800,7 +11778,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2909"
+            line="2847"
             column="9"/>
     </issue>
 
@@ -11811,7 +11789,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2910"
+            line="2848"
             column="9"/>
     </issue>
 
@@ -11822,7 +11800,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2914"
+            line="2852"
             column="19"/>
     </issue>
 
@@ -11833,7 +11811,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2915"
+            line="2853"
             column="9"/>
     </issue>
 
@@ -11844,7 +11822,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2920"
+            line="2858"
             column="19"/>
     </issue>
 
@@ -11855,7 +11833,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2921"
+            line="2859"
             column="9"/>
     </issue>
 
@@ -11866,7 +11844,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2922"
+            line="2860"
             column="9"/>
     </issue>
 
@@ -11877,7 +11855,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2928"
+            line="2866"
             column="19"/>
     </issue>
 
@@ -11888,7 +11866,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2931"
+            line="2869"
             column="19"/>
     </issue>
 
@@ -11899,7 +11877,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2931"
+            line="2869"
             column="38"/>
     </issue>
 
@@ -11910,7 +11888,7 @@
         errorLine2="             ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2953"
+            line="2891"
             column="14"/>
     </issue>
 
@@ -11921,7 +11899,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2958"
+            line="2896"
             column="14"/>
     </issue>
 
@@ -11932,7 +11910,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2976"
+            line="2914"
             column="14"/>
     </issue>
 
@@ -11943,7 +11921,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2982"
+            line="2920"
             column="14"/>
     </issue>
 
@@ -11954,7 +11932,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2982"
+            line="2920"
             column="41"/>
     </issue>
 
@@ -11965,7 +11943,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2990"
+            line="2928"
             column="14"/>
     </issue>
 
@@ -11976,7 +11954,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2991"
+            line="2929"
             column="11"/>
     </issue>
 
@@ -11987,7 +11965,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2999"
+            line="2937"
             column="14"/>
     </issue>
 
@@ -11998,7 +11976,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="2999"
+            line="2937"
             column="43"/>
     </issue>
 
@@ -12009,7 +11987,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3007"
+            line="2945"
             column="14"/>
     </issue>
 
@@ -12020,7 +11998,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3024"
+            line="2962"
             column="14"/>
     </issue>
 
@@ -12031,7 +12009,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3030"
+            line="2968"
             column="14"/>
     </issue>
 
@@ -12042,7 +12020,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3030"
+            line="2968"
             column="43"/>
     </issue>
 
@@ -12053,7 +12031,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3038"
+            line="2976"
             column="14"/>
     </issue>
 
@@ -12064,7 +12042,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3039"
+            line="2977"
             column="11"/>
     </issue>
 
@@ -12075,7 +12053,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3047"
+            line="2985"
             column="14"/>
     </issue>
 
@@ -12086,7 +12064,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3047"
+            line="2985"
             column="45"/>
     </issue>
 
@@ -12097,7 +12075,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3055"
+            line="2993"
             column="14"/>
     </issue>
 
@@ -12108,7 +12086,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3072"
+            line="3010"
             column="14"/>
     </issue>
 
@@ -12119,7 +12097,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3078"
+            line="3016"
             column="14"/>
     </issue>
 
@@ -12130,7 +12108,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3078"
+            line="3016"
             column="47"/>
     </issue>
 
@@ -12141,7 +12119,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3086"
+            line="3024"
             column="14"/>
     </issue>
 
@@ -12152,7 +12130,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3087"
+            line="3025"
             column="11"/>
     </issue>
 
@@ -12163,7 +12141,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3095"
+            line="3033"
             column="14"/>
     </issue>
 
@@ -12174,7 +12152,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3095"
+            line="3033"
             column="49"/>
     </issue>
 
@@ -12185,7 +12163,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3103"
+            line="3041"
             column="14"/>
     </issue>
 
@@ -12196,7 +12174,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3113"
+            line="3051"
             column="21"/>
     </issue>
 
@@ -12207,7 +12185,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3114"
+            line="3052"
             column="9"/>
     </issue>
 
@@ -12218,7 +12196,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3115"
+            line="3053"
             column="9"/>
     </issue>
 
@@ -12229,7 +12207,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3115"
+            line="3053"
             column="32"/>
     </issue>
 
@@ -12240,7 +12218,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3177"
+            line="3115"
             column="19"/>
     </issue>
 
@@ -12251,7 +12229,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3183"
+            line="3121"
             column="19"/>
     </issue>
 
@@ -12262,7 +12240,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3209"
+            line="3147"
             column="5"/>
     </issue>
 
@@ -12273,7 +12251,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3211"
+            line="3149"
             column="12"/>
     </issue>
 
@@ -12284,7 +12262,7 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3240"
+            line="3178"
             column="21"/>
     </issue>
 
@@ -12295,7 +12273,7 @@
         errorLine2="                    ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3244"
+            line="3182"
             column="21"/>
     </issue>
 
@@ -12306,7 +12284,7 @@
         errorLine2="           ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3257"
+            line="3195"
             column="12"/>
     </issue>
 
@@ -12317,7 +12295,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3288"
+            line="3226"
             column="12"/>
     </issue>
 
@@ -12328,7 +12306,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3354"
+            line="3292"
             column="19"/>
     </issue>
 
@@ -12339,7 +12317,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3355"
+            line="3293"
             column="9"/>
     </issue>
 
@@ -12350,7 +12328,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3360"
+            line="3298"
             column="19"/>
     </issue>
 
@@ -12361,7 +12339,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3361"
+            line="3299"
             column="9"/>
     </issue>
 
@@ -12372,7 +12350,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3362"
+            line="3300"
             column="9"/>
     </issue>
 
@@ -12383,7 +12361,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3367"
+            line="3305"
             column="19"/>
     </issue>
 
@@ -12394,7 +12372,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3368"
+            line="3306"
             column="9"/>
     </issue>
 
@@ -12405,7 +12383,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3373"
+            line="3311"
             column="19"/>
     </issue>
 
@@ -12416,7 +12394,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3374"
+            line="3312"
             column="9"/>
     </issue>
 
@@ -12427,7 +12405,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3375"
+            line="3313"
             column="9"/>
     </issue>
 
@@ -12438,7 +12416,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3380"
+            line="3318"
             column="19"/>
     </issue>
 
@@ -12449,7 +12427,7 @@
         errorLine2="                                                                                     ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3380"
+            line="3318"
             column="86"/>
     </issue>
 
@@ -12460,7 +12438,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3385"
+            line="3323"
             column="19"/>
     </issue>
 
@@ -12471,7 +12449,7 @@
         errorLine2="        ~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3386"
+            line="3324"
             column="9"/>
     </issue>
 
@@ -12482,7 +12460,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3387"
+            line="3325"
             column="9"/>
     </issue>
 
@@ -12493,7 +12471,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3392"
+            line="3330"
             column="19"/>
     </issue>
 
@@ -12504,7 +12482,7 @@
         errorLine2="                                                                                     ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3392"
+            line="3330"
             column="86"/>
     </issue>
 
@@ -12515,7 +12493,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3397"
+            line="3335"
             column="19"/>
     </issue>
 
@@ -12526,7 +12504,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3398"
+            line="3336"
             column="9"/>
     </issue>
 
@@ -12537,7 +12515,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3399"
+            line="3337"
             column="9"/>
     </issue>
 
@@ -12548,7 +12526,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3404"
+            line="3342"
             column="19"/>
     </issue>
 
@@ -12559,7 +12537,7 @@
         errorLine2="                                                                                              ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3404"
+            line="3342"
             column="95"/>
     </issue>
 
@@ -12570,7 +12548,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3408"
+            line="3346"
             column="19"/>
     </issue>
 
@@ -12581,7 +12559,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3409"
+            line="3347"
             column="9"/>
     </issue>
 
@@ -12592,7 +12570,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3410"
+            line="3348"
             column="9"/>
     </issue>
 
@@ -12603,7 +12581,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3414"
+            line="3352"
             column="19"/>
     </issue>
 
@@ -12614,7 +12592,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3415"
+            line="3353"
             column="9"/>
     </issue>
 
@@ -12625,7 +12603,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3420"
+            line="3358"
             column="19"/>
     </issue>
 
@@ -12636,7 +12614,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3421"
+            line="3359"
             column="9"/>
     </issue>
 
@@ -12647,7 +12625,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3422"
+            line="3360"
             column="9"/>
     </issue>
 
@@ -12658,7 +12636,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3428"
+            line="3366"
             column="19"/>
     </issue>
 
@@ -12669,7 +12647,7 @@
         errorLine2="                  ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3431"
+            line="3369"
             column="19"/>
     </issue>
 
@@ -12680,7 +12658,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3431"
+            line="3369"
             column="38"/>
     </issue>
 
@@ -12691,7 +12669,7 @@
         errorLine2="             ~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3453"
+            line="3391"
             column="14"/>
     </issue>
 
@@ -12702,7 +12680,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3458"
+            line="3396"
             column="14"/>
     </issue>
 
@@ -12713,7 +12691,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3484"
+            line="3422"
             column="14"/>
     </issue>
 
@@ -12724,7 +12702,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3494"
+            line="3432"
             column="14"/>
     </issue>
 
@@ -12735,7 +12713,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3494"
+            line="3432"
             column="41"/>
     </issue>
 
@@ -12746,7 +12724,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3506"
+            line="3444"
             column="14"/>
     </issue>
 
@@ -12757,7 +12735,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3507"
+            line="3445"
             column="11"/>
     </issue>
 
@@ -12768,7 +12746,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3519"
+            line="3457"
             column="14"/>
     </issue>
 
@@ -12779,7 +12757,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3519"
+            line="3457"
             column="43"/>
     </issue>
 
@@ -12790,7 +12768,7 @@
         errorLine2="             ~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3531"
+            line="3469"
             column="14"/>
     </issue>
 
@@ -12801,7 +12779,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3541"
+            line="3479"
             column="21"/>
     </issue>
 
@@ -12812,7 +12790,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3542"
+            line="3480"
             column="9"/>
     </issue>
 
@@ -12823,7 +12801,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3543"
+            line="3481"
             column="9"/>
     </issue>
 
@@ -12834,7 +12812,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3543"
+            line="3481"
             column="32"/>
     </issue>
 
@@ -12845,7 +12823,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3602"
+            line="3540"
             column="19"/>
     </issue>
 
@@ -12856,7 +12834,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="../../../../../out/androidx/wear/tiles/tiles-proto/build/generated/source/proto/main/java/androidx/wear/tiles/proto/DimensionProto.java"
-            line="3608"
+            line="3546"
             column="19"/>
     </issue>
 
diff --git a/wear/wear-watchface/lint-baseline.xml b/wear/wear-watchface/lint-baseline.xml
index 5b18f1e..234f8b1 100644
--- a/wear/wear-watchface/lint-baseline.xml
+++ b/wear/wear-watchface/lint-baseline.xml
@@ -63,7 +63,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/androidx/wear/watchface/Renderer.kt"
-            line="304"
+            line="325"
             column="35"/>
     </issue>
 
diff --git a/webkit/integration-tests/testapp/src/main/res/values/strings.xml b/webkit/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from webkit/integration-tests/testapp/src/main/res/values/strings.xml
rename to webkit/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
diff --git a/window/window/lint-baseline.xml b/window/window/lint-baseline.xml
deleted file mode 100644
index 6527643..0000000
--- a/window/window/lint-baseline.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.2.0-beta06" client="gradle" variant="debug" version="4.2.0-beta06">
-
-    <issue
-        id="BanUncheckedReflection"
-        message="Calling Method.invoke without an SDK check"
-        errorLine1="            bounds = new Rect((Rect) getBoundsMethod.invoke(windowConfig));"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="158"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="BanUncheckedReflection"
-        message="Calling Method.invoke without an SDK check"
-        errorLine1="                bounds.set((Rect) getAppBounds.invoke(windowConfig));"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="192"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="BanUncheckedReflection"
-        message="Calling Method.invoke without an SDK check"
-        errorLine1="                bounds.set((Rect) getAppBounds.invoke(windowConfig));"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="195"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="BanUncheckedReflection"
-        message="Calling Method.invoke without an SDK check"
-        errorLine1="            getDisplayInfoMethod.invoke(display, displayInfo);"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="383"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            if (activity.isInMultiWindowMode()) {"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="190"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 17; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        currentDisplay.getRealSize(realDisplaySize);"
-        errorLine2="                       ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="207"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        if (!activity.isInMultiWindowMode()) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="209"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                &amp;&amp; !activity.isInMultiWindowMode()) {"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="225"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (bounds.left == displayCutout.getSafeInsetLeft()) {"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="232"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (realDisplaySize.x - bounds.right == displayCutout.getSafeInsetRight()) {"
-        errorLine2="                                                                      ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="236"
-            column="71"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    bounds.right += displayCutout.getSafeInsetRight();"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="237"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (bounds.top == displayCutout.getSafeInsetTop()) {"
-        errorLine2="                                                ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="240"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                if (realDisplaySize.y - bounds.bottom == displayCutout.getSafeInsetBottom()) {"
-        errorLine2="                                                                       ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="244"
-            column="72"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 28; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="                    bounds.bottom += displayCutout.getSafeInsetBottom();"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="245"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 24; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="        if (!activity.isInMultiWindowMode()) {"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="274"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="ClassVerificationFailure"
-        message="This call references a method added in API level 17; however, the containing class androidx.window.WindowBoundsHelper is reachable from earlier API levels and will fail run-time class verification."
-        errorLine1="            display.getRealSize(size);"
-        errorLine2="                    ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/window/WindowBoundsHelper.java"
-            line="330"
-            column="21"/>
-    </issue>
-
-</issues>
diff --git a/work/integration-tests/testapp/lint-baseline.xml b/work/integration-tests/testapp/lint-baseline.xml
index cb9618f..b8627cf 100644
--- a/work/integration-tests/testapp/lint-baseline.xml
+++ b/work/integration-tests/testapp/lint-baseline.xml
@@ -150,7 +150,7 @@
         errorLine1="    &lt;integer name=&quot;channel_importance&quot;>3&lt;/integer>"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="45"
             column="14"/>
     </issue>
@@ -161,7 +161,7 @@
         errorLine1="    &lt;integer name=&quot;notification_id&quot;>1&lt;/integer>"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/res/values/strings.xml"
+            file="src/main/res/values/donottranslate-strings.xml"
             line="48"
             column="14"/>
     </issue>
diff --git a/work/integration-tests/testapp/src/main/res/values/strings.xml b/work/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml
similarity index 100%
rename from work/integration-tests/testapp/src/main/res/values/strings.xml
rename to work/integration-tests/testapp/src/main/res/values/donottranslate-strings.xml