diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java
index 2745a71..c45c776 100644
--- a/java/com/android/dialer/dialpadview/DialpadFragment.java
+++ b/java/com/android/dialer/dialpadview/DialpadFragment.java
@@ -470,11 +470,13 @@
     }
 
     if (shouldShowEmergencyCallWarning(getContext())) {
-      digitsHint.setText(
-          getContext().getString(R.string.dialpad_hint_emergency_calling_not_available));
+      String hint = getContext().getString(R.string.dialpad_hint_emergency_calling_not_available);
+      digits.setContentDescription(hint);
+      digitsHint.setText(hint);
       digitsHint.setVisibility(View.VISIBLE);
       return;
     }
+    digits.setContentDescription(null);
     digitsHint.setVisibility(View.GONE);
   }
 
diff --git a/java/com/android/dialer/dialpadview/res/values/strings.xml b/java/com/android/dialer/dialpadview/res/values/strings.xml
index eb5c04f..afa0237 100644
--- a/java/com/android/dialer/dialpadview/res/values/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values/strings.xml
@@ -97,9 +97,9 @@
        Ignored if empty. -->
   <string name="config_prohibited_phone_number_regexp" translatable="false"></string>
 
-  <!-- Warning hint shown in the dialpad input field when emergency call (911, etc.) cannot be made.
+  <!-- Warning hint shown in the dialpad input field when emergency call (911, etc.) cannot be made over wifi.
        [CHAR_LIMIT=60] -->
-  <string name="dialpad_hint_emergency_calling_not_available">Emergency calling not available</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Can\'t make emergency calls over WiFi</string>
 
   <!-- Dialog message which is shown when the user tries to make a phone call
        to prohibited phone numbers [CHAR LIMIT=NONE] -->