Snap for 4647811 from b52886656b6c544a8048bcce81b48c39e73d8930 to pi-release

Change-Id: Iad991b995f53479273131221e9c39200f8592774
diff --git a/res/drawable/ic_mode_edit_24dp.xml b/res/drawable/ic_mode_edit_24dp.xml
index 275f97b..c1a4463 100644
--- a/res/drawable/ic_mode_edit_24dp.xml
+++ b/res/drawable/ic_mode_edit_24dp.xml
@@ -17,6 +17,6 @@
     android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp"
-    android:tint="#61000000">
+    android:tint="?android:attr/colorControlNormal">
     <path android:fillColor="#FFFFFFFF" android:pathData="M3 18.08v2.42c0 .28.22.5.5.5h2.42c.53 0 1.04-.21 1.41-.59L17.81 9.94l-3.75-3.75L3.59 16.66c-.38.38-.59.89-.59 1.42zM20.71 7.04a.996.996 0 0 0 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
 </vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 705a96d..9d3ff75 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -213,9 +213,9 @@
     <string name="clear_all_message">Clear all information and contacts?</string>
     <!-- Information footer describing the use of emergency information. [CHAR LIMIT=NONE] -->
     <string name="emergency_info_footer">Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen, and dial your contacts by tapping their names, without unlocking your phone.</string>
-    <!-- Title for a suggestion to a user to set up their emergency information [CHAR_LIMIT=60] -->
+    <!-- Title for a suggestion to a user to set up their emergency information [CHAR_LIMIT=46] -->
     <string name="settings_suggestion_title">Add emergency information</string>
-    <!-- Explanatory text for a suggestion to a user to set up their emergency information [CHAR_LIMIT=NONE] -->
-    <string name="settings_suggestion_body">Help first responders find important information</string>
+    <!-- Explanatory text for a suggestion to a user to set up their emergency information [CHAR_LIMIT=55] -->
+    <string name="settings_suggestion_body">Let first responders see your information</string>
 
 </resources>