diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 5b06f0d8faa..331d4a49601 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -73,7 +73,7 @@
                         android:layout_marginEnd="0dp"/>
 
                     <TextView
-                        android:id="@+id/message"
+                        android:id="@+id/sud_layout_description"
                         style="@style/SudDescription.Glif"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index d140badbaeb..544dd269d84 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -39,7 +39,7 @@
 
         <TextView
             style="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:id="@+id/detailsText"
+            android:id="@+id/sud_layout_description"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="24dp"
             android:layout_marginTop="8dp"
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index bcfd907c577..20a7bfcdd43 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -47,7 +47,7 @@
 
             <TextView
                 style="@*android:style/TextAppearance.DeviceDefault.Body1"
-                android:id="@+id/detailsText"
+                android:id="@+id/sud_layout_description"
                 android:layout_marginStart="32dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginTop="12dp"
diff --git a/res/layout-land/confirm_lock_pattern_normal.xml b/res/layout-land/confirm_lock_pattern_normal.xml
index 8bb713f79d4..ded8d1aa890 100644
--- a/res/layout-land/confirm_lock_pattern_normal.xml
+++ b/res/layout-land/confirm_lock_pattern_normal.xml
@@ -55,7 +55,7 @@
 
                 <TextView
                     style="@style/SudDescription.Glif"
-                    android:id="@+id/detailsText"
+                    android:id="@+id/sud_layout_description"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="?attr/sudMarginSides"
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index 734f8a3c06f..3b77b8499c7 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -72,7 +72,7 @@
 
                     <TextView
                         style="@style/SudDescription.Glif"
-                        android:id="@+id/start_message"
+                        android:id="@+id/sud_layout_description"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_fingerprint_enroll_start_message"/>
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index 6d8794ad193..fe9b3d75f3d 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -73,6 +73,7 @@
                         android:layout_marginEnd="0dp" />
 
                     <TextView
+                        android:id="@+id/sud_layout_description"
                         style="@style/SudDescription.Glif"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index e80176d2c25..41595168805 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -64,7 +64,7 @@
                     android:layout_marginRight="0dp"/>
 
                 <TextView
-                    android:id="@+id/message"
+                    android:id="@+id/sud_layout_description"
                     style="@style/SudDescription.Glif"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 22934ba7b62..ed25e747174 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -42,7 +42,7 @@
 
         <TextView
             style="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:id="@+id/detailsText"
+            android:id="@+id/sud_layout_description"
             android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
             android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
             android:layout_marginTop="12dp"
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index 25fa08faaa2..b02f9c06858 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -51,7 +51,7 @@
 
                 <TextView
                     style="@*android:style/TextAppearance.DeviceDefault.Body1"
-                    android:id="@+id/detailsText"
+                    android:id="@+id/sud_layout_description"
                     android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
                     android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
                     android:layout_marginTop="12dp"