diff --git a/res/values/strings.xml b/res/values/strings.xml
index 15515cb17c2..63bf8b21744 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1739,6 +1739,11 @@
     <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
     <string name="current_screen_lock">Current screen lock</string>
 
+    <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+    <string name="unlock_accessibility_pin_area">PIN area</string>
+    <!-- Accessibility description of the normal password view. [CHAR_LIMIT=none] -->
+    <string name="unlock_accessibility_password">Device password</string>
+
     <!-- Title for preference that guides the user through creating a backup unlock pattern for fingerprint [CHAR LIMIT=45]-->
     <string name="fingerprint_unlock_set_unlock_pattern">Pattern \u2022 Fingerprint</string>
     <!-- Title for preference that guides the user through creating a backup unlock PIN for fingerprint [CHAR LIMIT=45]-->
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 7892ac47ffa..60589535f2d 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -585,10 +585,10 @@ public class ChooseLockPassword extends SettingsActivity {
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
             if (mIsAlphaMode) {
                 mPasswordEntry.setContentDescription(
-                        getString(R.string.unlock_set_unlock_password_title));
+                        getString(R.string.unlock_accessibility_password));
             } else {
                 mPasswordEntry.setContentDescription(
-                        getString(R.string.unlock_set_unlock_pin_title));
+                        getString(R.string.unlock_accessibility_pin_area));
             }
             // Can't set via XML since setInputType resets the fontFamily to null
             mPasswordEntry.setTypeface(Typeface.create(
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index a09db22c215..ee9e3171dc2 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -66,7 +66,6 @@ import com.android.internal.widget.LockscreenCredential;
 import com.android.internal.widget.TextViewInputDisabler;
 import com.android.settings.R;
 import com.android.settings.SetupRedactionInterstitial;
-import com.android.settings.SetupWizardUtils;
 import com.android.settings.Utils;
 import com.android.settingslib.animation.AppearAnimationUtils;
 import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -211,12 +210,12 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
             if (mIsAlpha) {
                 mPasswordEntry.setInputType(currentType);
                 mPasswordEntry.setContentDescription(
-                        getContext().getString(R.string.unlock_set_unlock_password_title));
+                        getContext().getString(R.string.unlock_accessibility_password));
             } else {
                 mPasswordEntry.setInputType(
                         InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
                 mPasswordEntry.setContentDescription(
-                        getContext().getString(R.string.unlock_set_unlock_pin_title));
+                        getContext().getString(R.string.unlock_accessibility_pin_area));
             }
             // Can't set via XML since setInputType resets the fontFamily to null
             mPasswordEntry.setTypeface(Typeface.create(