diff --git a/java/com/android/contacts/common/res/values-mr/strings.xml b/java/com/android/contacts/common/res/values-mr/strings.xml
index ee3af80..72e5282 100644
--- a/java/com/android/contacts/common/res/values-mr/strings.xml
+++ b/java/com/android/contacts/common/res/values-mr/strings.xml
@@ -46,7 +46,7 @@
     <string name="sms_mobile" msgid="8883045857887736518">"मोबाईलवर मजकूर पाठवा"</string>
     <string name="sms_work" msgid="4158595439553450966">"कार्यस्थानी मजकूर पाठवा"</string>
     <string name="sms_fax_work" msgid="5483726627718055248">"कार्य फॅक्सवर मजकूर पाठवा"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"निवासस्थान फॅक्सवर मजकूर पाठवा"</string>
+    <string name="sms_fax_home" msgid="9219265155770746077">"घर फॅक्सवर मजकूर पाठवा"</string>
     <string name="sms_pager" msgid="4901085068525193933">"पेजरवर मजकूर पाठवा"</string>
     <string name="sms_other" msgid="1742702947993285933">"मजकूर"</string>
     <string name="sms_callback" msgid="5833483630377538308">"कॉलबॅक वर मजकूर पाठवा"</string>
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index b23e18d..301fc00 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -58,9 +58,9 @@
 import com.android.dialer.calllogutils.PhoneAccountUtils;
 import com.android.dialer.calllogutils.PhoneCallDetails;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.AsyncTaskExecutor;
-import com.android.dialer.common.AsyncTaskExecutors;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.AsyncTaskExecutor;
+import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
@@ -457,6 +457,7 @@
       final long rowId,
       final PhoneCallDetails details,
       final CallDetailsEntries callDetailsEntries) {
+    LogUtil.d("CallLogAdapter.loadAndRender", "position: %d", views.getAdapterPosition());
     // Reset block and spam information since this view could be reused which may contain
     // outdated data.
     views.isSpam = false;
@@ -667,12 +668,13 @@
         && !isVoicemailNumber) {
       // Lookup contacts with this number
       // Only do remote lookup in first 5 rows.
+      int position = views.getAdapterPosition();
       info =
           mContactInfoCache.getValue(
               details.number + details.postDialDigits,
               details.countryIso,
               details.cachedContactInfo,
-              rowId
+              position
                   < Bindings.get(mActivity)
                       .getConfigProvider()
                       .getLong("number_of_call_to_do_remote_lookup", 5L));
@@ -699,6 +701,17 @@
       details.objectId = info.objectId;
       details.contactUserType = info.userType;
     }
+    LogUtil.d(
+        "CallLogAdapter.loadData",
+        "position:%d, update geo info: %s, cequint caller id geo: %s, photo uri: %s <- %s",
+        views.getAdapterPosition(),
+        details.geocode,
+        info.geoDescription,
+        details.photoUri,
+        info.photoUri);
+    if (!TextUtils.isEmpty(info.geoDescription)) {
+      details.geocode = info.geoDescription;
+    }
 
     views.info = info;
     views.numberType =
diff --git a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
index 2198626..2aedb6f 100644
--- a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
+++ b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
@@ -28,8 +28,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import com.android.dialer.common.AsyncTaskExecutor;
-import com.android.dialer.common.AsyncTaskExecutors;
+import com.android.dialer.common.concurrent.AsyncTaskExecutor;
+import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.voicemail.VoicemailClient;
 
diff --git a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
index 6c35711..ab5541b 100644
--- a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
+++ b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
@@ -18,9 +18,11 @@
 
 import android.os.Handler;
 import android.os.Message;
+import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.util.ExpirableCache;
@@ -97,39 +99,29 @@
     NumberWithCountryIso numberCountryIso = new NumberWithCountryIso(number, countryIso);
     ExpirableCache.CachedValue<ContactInfo> cachedInfo = mCache.getCachedValue(numberCountryIso);
     ContactInfo info = cachedInfo == null ? null : cachedInfo.getValue();
+    int requestType =
+        remoteLookupIfNotFoundLocally
+            ? ContactInfoRequest.TYPE_LOCAL_AND_REMOTE
+            : ContactInfoRequest.TYPE_LOCAL;
     if (cachedInfo == null) {
       mCache.put(numberCountryIso, ContactInfo.EMPTY);
       // Use the cached contact info from the call log.
       info = callLogContactInfo;
       // The db request should happen on a non-UI thread.
       // Request the contact details immediately since they are currently missing.
-      int requestType =
-          remoteLookupIfNotFoundLocally
-              ? ContactInfoRequest.TYPE_LOCAL_AND_REMOTE
-              : ContactInfoRequest.TYPE_LOCAL;
       enqueueRequest(number, countryIso, callLogContactInfo, /* immediate */ true, requestType);
       // We will format the phone number when we make the background request.
     } else {
       if (cachedInfo.isExpired()) {
         // The contact info is no longer up to date, we should request it. However, we
         // do not need to request them immediately.
-        enqueueRequest(
-            number,
-            countryIso,
-            callLogContactInfo, /* immediate */
-            false,
-            ContactInfoRequest.TYPE_LOCAL);
+        enqueueRequest(number, countryIso, callLogContactInfo, /* immediate */ false, requestType);
       } else if (!callLogInfoMatches(callLogContactInfo, info)) {
         // The call log information does not match the one we have, look it up again.
         // We could simply update the call log directly, but that needs to be done in a
         // background thread, so it is easier to simply request a new lookup, which will, as
         // a side-effect, update the call log.
-        enqueueRequest(
-            number,
-            countryIso,
-            callLogContactInfo, /* immediate */
-            false,
-            ContactInfoRequest.TYPE_LOCAL);
+        enqueueRequest(number, countryIso, callLogContactInfo, /* immediate */ false, requestType);
       }
 
       if (info == ContactInfo.EMPTY) {
@@ -152,9 +144,19 @@
    * to update its content.
    */
   private boolean queryContactInfo(ContactInfoRequest request) {
+    LogUtil.d(
+        "ContactInfoCache.queryContactInfo",
+        "request number: %s, type: %d",
+        LogUtil.sanitizePhoneNumber(request.number),
+        request.type);
     ContactInfo info;
     if (request.isLocalRequest()) {
       info = mContactInfoHelper.lookupNumber(request.number, request.countryIso);
+      // TODO: Maybe skip look up if it's already available in cached number lookup service.
+      long start = SystemClock.uptimeMillis();
+      mContactInfoHelper.updateFromCequintCallerId(info, request.number);
+      long time = SystemClock.uptimeMillis() - start;
+      LogUtil.d("ContactInfoCache.queryContactInfo", "Cequint Caller Id look up takes %d ms", time);
       if (request.type == ContactInfoRequest.TYPE_LOCAL_AND_REMOTE) {
         if (!mContactInfoHelper.hasName(info)) {
           enqueueRequest(
diff --git a/java/com/android/dialer/app/res/values-ne/strings.xml b/java/com/android/dialer/app/res/values-ne/strings.xml
index 29eaccd..3398964 100644
--- a/java/com/android/dialer/app/res/values-ne/strings.xml
+++ b/java/com/android/dialer/app/res/values-ne/strings.xml
@@ -193,7 +193,7 @@
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कल रोक्दै"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"भ्वाइस मेल"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कल अवरुद्ध अस्थायी रुपमा निष्क्रिय"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"कल अवरुद्ध अस्थायी रुपमा असक्षम गरिएको छ किनभने तपाईँले अन्तिम ४८ घण्टा भित्र यस फोनबाट आपत्कालीन सेवाहरू सम्पर्क गर्नुभयो। एकपटक ४८ घण्टा अवधि समाप्त भएपछि यो स्वचालित रूपले पुनः सक्रिय हुनेछ।"</string>
+    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"कल अवरुद्ध अस्थायी रुपमा असक्षम गरिएको छ किनभने तपाईँले अन्तिम ४८ घन्टा भित्र यस फोनबाट आपत्कालीन सेवाहरू सम्पर्क गर्नुभयो। एकपटक ४८ घन्टा अवधि समाप्त भएपछि यो स्वचालित रूपले पुनः सक्रिय हुनेछ।"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नम्बरहरू आयात गर्नुहोस्"</string>
     <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"तपाईँले पहिल्यै केही कल गर्ने व्यक्तिहरूलाई अन्य अनुप्रयोगहरू मार्फत स्वत: रूपमा भ्वाइस मेल पठाउन नै चिन्ह लगाउनु भएको थियो।"</string>
     <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"नम्बरहरू हेर्नुहोस्"</string>
diff --git a/java/com/android/dialer/app/res/values-uz/strings.xml b/java/com/android/dialer/app/res/values-uz/strings.xml
index d26c53c..11befbc 100644
--- a/java/com/android/dialer/app/res/values-uz/strings.xml
+++ b/java/com/android/dialer/app/res/values-uz/strings.xml
@@ -40,7 +40,7 @@
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Javobsiz chaqiruvlar"</string>
     <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ta javobsiz chaqiruv"</string>
     <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Telefon"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"SMS yuborish"</string>
+    <string name="notification_missedCall_message" msgid="5086910028988305964">"SMS yozish"</string>
     <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
     <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ta ovozli xabar </item>
@@ -143,7 +143,7 @@
     <string name="contact_tooltip" msgid="8871614660967439999">"Barcha raqamlarni ko‘rish uchun rasm ustiga bosing yoki joyini o‘zgartirish uchun rasmni bosib turing."</string>
     <string name="remove_contact" msgid="2353580570488923668">"O‘chirish"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video qo‘ng‘iroq"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"SMS yuborish"</string>
+    <string name="call_log_action_send_message" msgid="6948727362660115554">"Xabar yuborish"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Chaqiruv tafsilotlari"</string>
     <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Yuborish:"</string>
     <string name="call_log_action_call" msgid="682724094251540583">"Qo‘ng‘iroq qilish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
index 994160f..492f208 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
@@ -46,10 +46,10 @@
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogListItemViewHolder;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.AsyncTaskExecutor;
-import com.android.dialer.common.AsyncTaskExecutors;
 import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.AsyncTaskExecutor;
+import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.nano.DialerImpression;
diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
index a23014b..80921cd 100644
--- a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
+++ b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
@@ -29,7 +29,7 @@
 import com.android.dialer.callcomposer.camera.exif.ExifTag;
 import com.android.dialer.callcomposer.util.CopyAndResizeImageTask;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.FallibleAsyncTask;
+import com.android.dialer.common.concurrent.FallibleAsyncTask;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.util.DialerUtils;
 import java.io.File;
diff --git a/java/com/android/dialer/callcomposer/util/CopyAndResizeImageTask.java b/java/com/android/dialer/callcomposer/util/CopyAndResizeImageTask.java
index 83580fd..be08555 100644
--- a/java/com/android/dialer/callcomposer/util/CopyAndResizeImageTask.java
+++ b/java/com/android/dialer/callcomposer/util/CopyAndResizeImageTask.java
@@ -26,8 +26,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.FallibleAsyncTask;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.FallibleAsyncTask;
 import com.android.dialer.util.DialerUtils;
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java
index 6070640..bb2f580 100644
--- a/java/com/android/dialer/calldetails/CallDetailsActivity.java
+++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java
@@ -32,7 +32,7 @@
 import com.android.dialer.calldetails.nano.CallDetailsEntries;
 import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.AsyncTaskExecutors;
+import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.nano.DialerImpression;
 import com.android.dialer.protos.ProtoParsers;
diff --git a/java/com/android/dialer/common/AsyncTaskExecutor.java b/java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java
similarity index 97%
rename from java/com/android/dialer/common/AsyncTaskExecutor.java
rename to java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java
index caadfe7..3bdcd03 100644
--- a/java/com/android/dialer/common/AsyncTaskExecutor.java
+++ b/java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dialer.common;
+package com.android.dialer.common.concurrent;
 
 import android.os.AsyncTask;
 import android.support.annotation.MainThread;
diff --git a/java/com/android/dialer/common/AsyncTaskExecutors.java b/java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java
similarity index 96%
rename from java/com/android/dialer/common/AsyncTaskExecutors.java
rename to java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java
index 77bebdb..fd35832 100644
--- a/java/com/android/dialer/common/AsyncTaskExecutors.java
+++ b/java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.dialer.common;
+package com.android.dialer.common.concurrent;
 
 import android.os.AsyncTask;
 import android.support.annotation.MainThread;
+import com.android.dialer.common.Assert;
 import java.util.concurrent.Executor;
 
 /**
diff --git a/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java b/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java
index acfcda7..65b4080 100644
--- a/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java
+++ b/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java
@@ -23,8 +23,6 @@
 import android.support.annotation.MainThread;
 import android.support.annotation.WorkerThread;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.AsyncTaskExecutor;
-import com.android.dialer.common.AsyncTaskExecutors;
 import com.android.dialer.common.LogUtil;
 
 /**
diff --git a/java/com/android/dialer/common/FallibleAsyncTask.java b/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java
similarity index 96%
rename from java/com/android/dialer/common/FallibleAsyncTask.java
rename to java/com/android/dialer/common/concurrent/FallibleAsyncTask.java
index f3abace..6d02fe6 100644
--- a/java/com/android/dialer/common/FallibleAsyncTask.java
+++ b/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java
@@ -14,12 +14,12 @@
  * limitations under the License
  */
 
-package com.android.dialer.common;
+package com.android.dialer.common.concurrent;
 
 import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import com.android.dialer.common.FallibleAsyncTask.FallibleTaskResult;
+import com.android.dialer.common.concurrent.FallibleAsyncTask.FallibleTaskResult;
 import com.google.auto.value.AutoValue;
 
 /**
diff --git a/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java b/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java
index 566d9f3..38f91da 100644
--- a/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java
+++ b/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
+
 package com.android.dialer.enrichedcall;
 
 import android.support.annotation.NonNull;
diff --git a/java/com/android/dialer/oem/AndroidManifest.xml b/java/com/android/dialer/oem/AndroidManifest.xml
index e161a6d..685bc3d 100644
--- a/java/com/android/dialer/oem/AndroidManifest.xml
+++ b/java/com/android/dialer/oem/AndroidManifest.xml
@@ -1,3 +1,18 @@
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
 <manifest
   package="com.android.dialer.oem">
 </manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/CequintCallerIdManager.java b/java/com/android/dialer/oem/CequintCallerIdManager.java
new file mode 100644
index 0000000..094cc84
--- /dev/null
+++ b/java/com/android/dialer/oem/CequintCallerIdManager.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.dialer.oem;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import android.telephony.PhoneNumberUtils;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.common.LogUtil;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Cequint Caller ID manager to provide caller information.
+ *
+ * <p>This is only enabled on Motorola devices for Sprint.
+ *
+ * <p>If it's enabled, this class will be called by call log and incall to get caller info from
+ * Cequint Caller ID. It also caches any information fetched in static map, which lives through
+ * whole application lifecycle.
+ */
+@TargetApi(VERSION_CODES.M)
+public class CequintCallerIdManager {
+
+  private static final String CONFIG_CALLER_ID_ENABLED = "config_caller_id_enabled";
+
+  private static final String PROVIDER_NAME = "com.cequint.ecid";
+
+  private static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/lookup");
+
+  private static final int CALLER_ID_LOOKUP_USER_PROVIDED_CID = 0x0001;
+  private static final int CALLER_ID_LOOKUP_SYSTEM_PROVIDED_CID = 0x0002;
+  private static final int CALLER_ID_LOOKUP_INCOMING_CALL = 0x0020;
+
+  private static final Uri CONTENT_URI_FOR_INCALL =
+      Uri.parse("content://" + PROVIDER_NAME + "/incalllookup");
+
+  // Column names in Cequint provider.
+  private static final String CITY_NAME = "cid_pCityName";
+  private static final String STATE_NAME = "cid_pStateName";
+  private static final String STATE_ABBR = "cid_pStateAbbr";
+  private static final String COUNTRY_NAME = "cid_pCountryName";
+  private static final String COMPANY = "cid_pCompany";
+  private static final String NAME = "cid_pName";
+  private static final String FIRST_NAME = "cid_pFirstName";
+  private static final String LAST_NAME = "cid_pLastName";
+  private static final String IMAGE = "cid_pImage";
+  private static final String DISPLAY_NAME = "cid_pDisplayName";
+
+  // TODO: Revisit it and maybe remove it if it's not necessary.
+  private static final ConcurrentHashMap<String, CequintCallerIdContact> callLogCache =
+      new ConcurrentHashMap<>();
+  // Cache for incall lookup. Key is phone number + "i" for incoming call or "o" for outgoing call.
+  // TODO: Revisit it and maybe remove it if it's not necessary.
+  private static final ConcurrentHashMap<String, CequintCallerIdContact> incallCache =
+      new ConcurrentHashMap<>();
+  private static boolean hasRegisteredContentObserver;
+  private static boolean hasAlreadyCheckedCequintCallerIdPackage;
+  private static boolean isCequintCallerIdEnabled;
+
+  /** Cequint caller id contact information. */
+  public static class CequintCallerIdContact {
+    public final String name;
+    public final String geoDescription;
+    public final String imageUrl;
+
+    private CequintCallerIdContact(String name, String geoDescription, String imageUrl) {
+      this.name = name;
+      this.geoDescription = geoDescription;
+      this.imageUrl = imageUrl;
+    }
+  }
+
+  /** Check whether Cequint Caller Id provider package is available and enabled. */
+  public static synchronized boolean isCequintCallerIdEnabled(@NonNull Context context) {
+    if (!ConfigProviderBindings.get(context).getBoolean(CONFIG_CALLER_ID_ENABLED, true)) {
+      return false;
+    }
+    if (!hasAlreadyCheckedCequintCallerIdPackage) {
+      hasAlreadyCheckedCequintCallerIdPackage = true;
+      isCequintCallerIdEnabled = false;
+
+      try {
+        context.getPackageManager().getPackageInfo(PROVIDER_NAME, 0);
+        isCequintCallerIdEnabled = true;
+      } catch (PackageManager.NameNotFoundException e) {
+        isCequintCallerIdEnabled = false;
+      }
+    }
+    return isCequintCallerIdEnabled;
+  }
+
+  @WorkerThread
+  public static CequintCallerIdContact getCequintCallerIdContact(Context context, String number) {
+    Assert.isWorkerThread();
+    LogUtil.d(
+        "CequintCallerIdManager.getCequintCallerIdContact",
+        "number: %s",
+        LogUtil.sanitizePhoneNumber(number));
+    registerContentObserver(context);
+    if (callLogCache.containsKey(number)) {
+      return callLogCache.get(number);
+    }
+    CequintCallerIdContact cequintCallerIdContact =
+        lookup(
+            context,
+            CONTENT_URI,
+            PhoneNumberUtils.stripSeparators(number),
+            new String[] {"system"});
+    if (cequintCallerIdContact != null) {
+      callLogCache.put(number, cequintCallerIdContact);
+    }
+    return cequintCallerIdContact;
+  }
+
+  @WorkerThread
+  public static CequintCallerIdContact getCequintCallerIdContactForInCall(
+      Context context, String number, String cnapName, boolean isIncoming) {
+    Assert.isWorkerThread();
+    LogUtil.d(
+        "CequintCallerIdManager.getCequintCallerIdContactForInCall",
+        "number: %s, cnapName: %s, isIncoming: %b",
+        LogUtil.sanitizePhoneNumber(number),
+        LogUtil.sanitizePii(cnapName),
+        isIncoming);
+    registerContentObserver(context);
+    String key = number + (isIncoming ? "i" : "o");
+    if (incallCache.containsKey(key)) {
+      return incallCache.get(key);
+    }
+    int flag = 0;
+    if (isIncoming) {
+      flag |= CALLER_ID_LOOKUP_INCOMING_CALL;
+      flag |= CALLER_ID_LOOKUP_SYSTEM_PROVIDED_CID;
+    } else {
+      flag |= CALLER_ID_LOOKUP_USER_PROVIDED_CID;
+    }
+    String[] flags = {cnapName, String.valueOf(flag)};
+    CequintCallerIdContact cequintCallerIdContact =
+        lookup(context, CONTENT_URI_FOR_INCALL, number, flags);
+    if (cequintCallerIdContact != null) {
+      incallCache.put(key, cequintCallerIdContact);
+    }
+    return cequintCallerIdContact;
+  }
+
+  @WorkerThread
+  @Nullable
+  private static CequintCallerIdContact lookup(
+      Context context, Uri uri, String number, String[] flags) {
+    Assert.isWorkerThread();
+
+    // Cequint is using custom arguments for content provider. See more details in b/35766080.
+    try (Cursor cursor = context.getContentResolver().query(uri, null, number, flags, null)) {
+      if (cursor != null && cursor.moveToFirst()) {
+        String city = getString(cursor, cursor.getColumnIndex(CITY_NAME));
+        String state = getString(cursor, cursor.getColumnIndex(STATE_NAME));
+        String stateAbbr = getString(cursor, cursor.getColumnIndex(STATE_ABBR));
+        String country = getString(cursor, cursor.getColumnIndex(COUNTRY_NAME));
+        String company = getString(cursor, cursor.getColumnIndex(COMPANY));
+        String name = getString(cursor, cursor.getColumnIndex(NAME));
+        String firstName = getString(cursor, cursor.getColumnIndex(FIRST_NAME));
+        String lastName = getString(cursor, cursor.getColumnIndex(LAST_NAME));
+        String imageUrl = getString(cursor, cursor.getColumnIndex(IMAGE));
+        String displayName = getString(cursor, cursor.getColumnIndex(DISPLAY_NAME));
+
+        String contactName =
+            TextUtils.isEmpty(displayName)
+                ? generateDisplayName(firstName, lastName, company, name)
+                : displayName;
+        String geoDescription = getGeoDescription(city, state, stateAbbr, country);
+        LogUtil.d(
+            "CequintCallerIdManager.lookup",
+            "number: %s, contact name: %s, geo: %s, photo url: %s",
+            LogUtil.sanitizePhoneNumber(number),
+            LogUtil.sanitizePii(contactName),
+            LogUtil.sanitizePii(geoDescription),
+            imageUrl);
+        return new CequintCallerIdContact(contactName, geoDescription, imageUrl);
+      } else {
+        LogUtil.d("CequintCallerIdManager.lookup", "No CequintCallerIdContact found");
+        return null;
+      }
+    }
+  }
+
+  private static String getString(Cursor cursor, int columnIndex) {
+    if (!cursor.isNull(columnIndex)) {
+      String string = cursor.getString(columnIndex);
+      if (!TextUtils.isEmpty(string)) {
+        return string;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns generated name from other names, e.g. first name, last name etc. Returns null if there
+   * is no other names.
+   */
+  @Nullable
+  private static String generateDisplayName(
+      String firstName, String lastName, String company, String name) {
+    boolean hasFirstName = !TextUtils.isEmpty(firstName);
+    boolean hasLastName = !TextUtils.isEmpty(lastName);
+    boolean hasCompanyName = !TextUtils.isEmpty(company);
+    boolean hasName = !TextUtils.isEmpty(name);
+
+    StringBuilder stringBuilder = new StringBuilder();
+
+    if (hasFirstName || hasLastName) {
+      if (hasFirstName) {
+        stringBuilder.append(firstName);
+        if (hasLastName) {
+          stringBuilder.append(" ");
+        }
+      }
+      if (hasLastName) {
+        stringBuilder.append(lastName);
+      }
+    } else if (hasCompanyName) {
+      stringBuilder.append(company);
+    } else if (hasName) {
+      stringBuilder.append(name);
+    } else {
+      return null;
+    }
+
+    if (stringBuilder.length() > 0) {
+      return stringBuilder.toString();
+    }
+    return null;
+  }
+
+  /** Returns geo location information. e.g. Mountain View, CA. */
+  private static String getGeoDescription(
+      String city, String state, String stateAbbr, String country) {
+    String geoDescription = null;
+
+    if (TextUtils.isEmpty(city) && !TextUtils.isEmpty(state)) {
+      geoDescription = state;
+    } else if (!TextUtils.isEmpty(city) && !TextUtils.isEmpty(stateAbbr)) {
+      geoDescription = city + ", " + stateAbbr;
+    } else if (!TextUtils.isEmpty(country)) {
+      geoDescription = country;
+    }
+    return geoDescription;
+  }
+
+  private static void registerContentObserver(Context context) {
+    if (hasRegisteredContentObserver) {
+      return;
+    }
+    ContentObserver contentObserver =
+        new ContentObserver(null) {
+          @Override
+          public void onChange(boolean selfChange) {
+            invalidateCache();
+          }
+        };
+
+    context.getContentResolver().registerContentObserver(CONTENT_URI, true, contentObserver);
+    context
+        .getContentResolver()
+        .registerContentObserver(CONTENT_URI_FOR_INCALL, true, contentObserver);
+    hasRegisteredContentObserver = true;
+  }
+
+  private static void invalidateCache() {
+    callLogCache.clear();
+    incallCache.clear();
+  }
+
+  private CequintCallerIdManager() {}
+}
diff --git a/java/com/android/dialer/phonenumbercache/ContactInfo.java b/java/com/android/dialer/phonenumbercache/ContactInfo.java
index d7a75c3..03240cc 100644
--- a/java/com/android/dialer/phonenumbercache/ContactInfo.java
+++ b/java/com/android/dialer/phonenumbercache/ContactInfo.java
@@ -38,6 +38,7 @@
   public String label;
   public String number;
   public String formattedNumber;
+  public String geoDescription;
   /*
    * ContactInfo.normalizedNumber is a column value returned by PhoneLookup query. By definition,
    * it's E164 representation.
@@ -121,7 +122,13 @@
     if (userType != other.userType) {
       return false;
     }
-    return carrierPresence == other.carrierPresence;
+    if (carrierPresence != other.carrierPresence) {
+      return false;
+    }
+    if (!TextUtils.equals(geoDescription, other.geoDescription)) {
+      return false;
+    }
+    return true;
   }
 
   @Override
@@ -160,6 +167,8 @@
         + userType
         + ", carrierPresence="
         + carrierPresence
+        + ", geoDescription="
+        + geoDescription
         + '}';
   }
 }
diff --git a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
index 6a5e2e6..66ddd06 100644
--- a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
+++ b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
@@ -33,12 +33,14 @@
 import android.support.annotation.Nullable;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
-import android.util.Log;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.ContactsUtils.UserType;
 import com.android.contacts.common.compat.DirectoryCompat;
 import com.android.contacts.common.util.Constants;
 import com.android.contacts.common.util.UriUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.oem.CequintCallerIdManager;
+import com.android.dialer.oem.CequintCallerIdManager.CequintCallerIdContact;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.telecom.TelecomUtil;
@@ -131,7 +133,7 @@
       }
     } catch (IllegalArgumentException e) {
       // Avoid dialer crash when lookup key is not valid
-      Log.e(TAG, "IllegalArgumentException in lookUpDisplayNameAlternative", e);
+      LogUtil.e(TAG, "IllegalArgumentException in lookUpDisplayNameAlternative", e);
     } finally {
       if (cursor != null) {
         cursor.close();
@@ -508,6 +510,11 @@
         values.put(Calls.CACHED_FORMATTED_NUMBER, updatedInfo.formattedNumber);
         needsUpdate = true;
       }
+
+      if (!TextUtils.equals(updatedInfo.geoDescription, callLogInfo.geoDescription)) {
+        values.put(Calls.GEOCODED_LOCATION, updatedInfo.geoDescription);
+        needsUpdate = true;
+      }
     } else {
       // No previous values, store all of them.
       values.put(Calls.CACHED_NAME, updatedInfo.name);
@@ -521,6 +528,7 @@
           Calls.CACHED_PHOTO_URI,
           UriUtils.uriToString(UriUtils.nullForNonContactsUri(updatedInfo.photoUri)));
       values.put(Calls.CACHED_FORMATTED_NUMBER, updatedInfo.formattedNumber);
+      values.put(Calls.GEOCODED_LOCATION, updatedInfo.geoDescription);
       needsUpdate = true;
     }
 
@@ -547,7 +555,7 @@
                 new String[] {number, countryIso});
       }
     } catch (SQLiteFullException e) {
-      Log.e(TAG, "Unable to update contact info in call log db", e);
+      LogUtil.e(TAG, "Unable to update contact info in call log db", e);
     }
   }
 
@@ -583,4 +591,28 @@
     return mCachedNumberLookupService != null
         && mCachedNumberLookupService.canReportAsInvalid(sourceType, objectId);
   }
+
+  /**
+   * Update ContactInfo by querying to Cequint Caller ID. Only name, geoDescription and photo uri
+   * will be updated if available.
+   */
+  public void updateFromCequintCallerId(ContactInfo info, String number) {
+    if (!CequintCallerIdManager.isCequintCallerIdEnabled(mContext)) {
+      return;
+    }
+    CequintCallerIdContact cequintCallerIdContact =
+        CequintCallerIdManager.getCequintCallerIdContact(mContext, number);
+    if (cequintCallerIdContact == null) {
+      return;
+    }
+    if (!TextUtils.isEmpty(cequintCallerIdContact.name)) {
+      info.name = cequintCallerIdContact.name;
+    }
+    if (!TextUtils.isEmpty(cequintCallerIdContact.geoDescription)) {
+      info.geoDescription = cequintCallerIdContact.geoDescription;
+    }
+    if (cequintCallerIdContact.imageUrl != null) {
+      info.photoUri = UriUtils.parseUriOrNull(cequintCallerIdContact.imageUrl);
+    }
+  }
 }
diff --git a/java/com/android/dialer/shortcuts/ShortcutRefresher.java b/java/com/android/dialer/shortcuts/ShortcutRefresher.java
index f5ff648..120382d 100644
--- a/java/com/android/dialer/shortcuts/ShortcutRefresher.java
+++ b/java/com/android/dialer/shortcuts/ShortcutRefresher.java
@@ -23,10 +23,10 @@
 import android.support.annotation.WorkerThread;
 import com.android.contacts.common.list.ContactEntry;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.AsyncTaskExecutor;
-import com.android.dialer.common.AsyncTaskExecutors;
-import com.android.dialer.common.FallibleAsyncTask;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.AsyncTaskExecutor;
+import com.android.dialer.common.concurrent.AsyncTaskExecutors;
+import com.android.dialer.common.concurrent.FallibleAsyncTask;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/java/com/android/dialer/shortcuts/ShortcutUsageReporter.java b/java/com/android/dialer/shortcuts/ShortcutUsageReporter.java
index 50130fc..3f0b2a6 100644
--- a/java/com/android/dialer/shortcuts/ShortcutUsageReporter.java
+++ b/java/com/android/dialer/shortcuts/ShortcutUsageReporter.java
@@ -35,9 +35,9 @@
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.AsyncTaskExecutor;
-import com.android.dialer.common.AsyncTaskExecutors;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.AsyncTaskExecutor;
+import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 
 /**
  * Reports outgoing calls as shortcut usage.
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml
index 276b47a..4ddaa6a 100644
--- a/java/com/android/incallui/AndroidManifest.xml
+++ b/java/com/android/incallui/AndroidManifest.xml
@@ -37,6 +37,10 @@
   <!-- Testing location -->
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
+  <!-- This is used for querying Cequint caller id.
+       TODO(b/36600947): Move to oem package. -->
+  <uses-permission android:name="com.cequint.ecid.CALLER_ID_LOOKUP" />
+
   <!-- Set android:taskAffinity="com.android.incallui" for all activities to ensure proper
   navigation. Otherwise system could bring up DialtactsActivity instead, e.g. when user unmerge a
   call.
diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java
index c4e25e7..4c8963a 100644
--- a/java/com/android/incallui/ContactInfoCache.java
+++ b/java/com/android/incallui/ContactInfoCache.java
@@ -25,6 +25,7 @@
 import android.os.AsyncTask;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
+import android.os.SystemClock;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
@@ -42,6 +43,8 @@
 import com.android.contacts.common.ContactsUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.logging.nano.ContactLookupResult;
+import com.android.dialer.oem.CequintCallerIdManager;
+import com.android.dialer.oem.CequintCallerIdManager.CequintCallerIdContact;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfo;
@@ -475,6 +478,25 @@
     return cacheEntry;
   }
 
+  private void maybeUpdateFromCequintCallerId(CallerInfo callerInfo, boolean isIncoming) {
+    if (!CequintCallerIdManager.isCequintCallerIdEnabled(mContext)) {
+      return;
+    }
+    CequintCallerIdContact cequintCallerIdContact =
+        CequintCallerIdManager.getCequintCallerIdContactForInCall(
+            mContext, callerInfo.phoneNumber, callerInfo.cnapName, isIncoming);
+
+    if (!TextUtils.isEmpty(cequintCallerIdContact.name)) {
+      callerInfo.name = cequintCallerIdContact.name;
+    }
+    if (!TextUtils.isEmpty(cequintCallerIdContact.geoDescription)) {
+      callerInfo.geoDescription = cequintCallerIdContact.geoDescription;
+    }
+    if (cequintCallerIdContact.imageUrl != null) {
+      callerInfo.contactDisplayPhotoUri = Uri.parse(cequintCallerIdContact.imageUrl);
+    }
+  }
+
   /**
    * Implemented for ContactsAsyncHelper.OnImageLoadCompleteListener interface. Update contact photo
    * when image is loaded in worker thread.
@@ -669,6 +691,7 @@
     int queryId;
     /** The phone number without any changes to display to the user (ex: cnap...) */
     String originalPhoneNumber;
+
     boolean isBusiness;
 
     @Override
@@ -738,6 +761,10 @@
       if (!isWaitingForThisQuery(cw.callId, mQueryToken.mQueryId)) {
         return;
       }
+      long start = SystemClock.uptimeMillis();
+      maybeUpdateFromCequintCallerId(ci, mIsIncoming);
+      long time = SystemClock.uptimeMillis() - start;
+      Log.d(TAG, "Cequint Caller Id look up takes " + time + " ms.");
       updateCallerInfoInCacheOnAnyThread(
           cw.callId, cw.numberPresentation, ci, mIsIncoming, true, mQueryToken);
     }
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index 6944711..5538567 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -35,9 +35,9 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.annotation.VisibleForTesting;
-import android.support.transition.TransitionManager;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
+import android.transition.TransitionManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.AccessibilityDelegate;
@@ -1030,6 +1030,9 @@
     if (primaryInfo == null) {
       return null;
     }
+    if (isVideoUpgradeRequest()) {
+      return null;
+    }
     return primaryInfo.multimediaData;
   }
 
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-af/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-af/strings.xml
index 31e4843..4550a39 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-af/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-af/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw-modus is geaktiveer"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw-modus is gedeaktiveer"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml
index 31e4843..5d96ebb 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"የPaw ሁነታ ነቅቷል"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"የPaw ሁነታ ተሰናክሏል"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml
index 31e4843..f926057 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"‏تم تمكين وضع المخلب"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"تم تعطيل وضع المخلب"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml
index 31e4843..7d73d41 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw rejimi aktiv edildi"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw rejimi deaktiv edildi"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml
index 31e4843..4203585 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Уключаны рэжым Paw"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Выключаны рэжым Paw"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml
index 31e4843..5dfab89 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Режимът Paw бе активиран"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Режимът Paw бе деактивиран"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml
index 31e4843..1d7ea8a 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw মোড সক্ষম করা আছে"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw মোড অক্ষম করা আছে"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml
index 31e4843..e3aad7d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Ručni način rada je omogućen"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Ručni način rada je onemogućen"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml
index 31e4843..161c584 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Mode PAW activat"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Mode PAW desactivat"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml
index 31e4843..1f680ce 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Režim Paw byl aktivován"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Režim Paw byl deaktivován"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml
index 31e4843..c6e9876 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Tilstanden Paw blev aktiveret"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Tilstanden Paw blev deaktiveret"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
index 31e4843..1de03a5 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"PAW-Modus aktiviert"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"PAW-Modus deaktiviert"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml
index 31e4843..ffc4b6d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Λειτουργία αποτυπώματος ενεργοποιημένη"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Λειτουργία αποτυπώματος απενεργοποιημένη"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml
index 31e4843..bdfce36 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw mode enabled"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw mode disabled"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml
index 31e4843..bdfce36 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw mode enabled"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw mode disabled"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml
index 31e4843..bdfce36 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw mode enabled"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw mode disabled"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml
index 31e4843..760ec37 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modo mascota habilitado"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modo mascota deshabilitado"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
index 31e4843..ebd8e2f 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modo PAW habilitado"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modo PAW inhabilitado"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml
index 31e4843..73a96af 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw-režiim on lubatud"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw-režiim on keelatud"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml
index 31e4843..19b078e 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw modua gaitu da"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw modua desgaitu da"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml
index 31e4843..ad7ee6a 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"‏حالت Paw فعال شد"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"‏حالت Paw غیرفعال شد"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml
index 31e4843..f269e70 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw-tila käytössä"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw-tila pois käytöstä"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml
index 31e4843..2ccb529 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Mode Paw activé"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Mode Paw désactivé"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml
index 31e4843..95ea529 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Mode PAW activé"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Mode PAW désactivé"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml
index 31e4843..0e0d1a7 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modo Paw activado"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modo Paw desactivado"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml
index 31e4843..d204d12 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw મોડ સક્ષમ કર્યો"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw મોડ અક્ષમ કર્યો"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml
index 31e4843..eb44da1 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"पॉ मोड सक्षम किया गया"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"पॉ मोड अक्षम किया गया"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
index 31e4843..abbeaf1 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Omogućen PAW način rada"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Onemoguće način rada PAW"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml
index 31e4843..11d7502 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw mód engedélyezve"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw mód letiltva"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml
index 31e4843..eac59c1 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw ռեժիմը միացված է"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw ռեժիմն անջատված է"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml
index 31e4843..f641a3c 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Mode paw diaktifkan"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Mode paw dinonaktifkan"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml
index 31e4843..d0e5561 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw-stilling virkjuð"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Slökkt á Paw-stillingu"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml
index 31e4843..f1f3cc2 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modalità Paw attivata"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modalità Paw disattivata"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml
index 31e4843..452cd6b 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"‏מצב טלפיים הופעל"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"‏מצב טלפיים הושבת"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml
index 31e4843..910c730 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw モードを有効にしました"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw モードを無効にしました"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml
index 31e4843..9b06694 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw რეჟიმი ჩართულია"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw რეჟიმი გამორთულია"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml
index 31e4843..119562c 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw режимі қосулы"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw режимі өшірулі"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml
index 31e4843..0df78f2 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"បាន​បើក​មុខងារ​ប៉ះ"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"បាន​បិទ​មុខងារ​ប៉ះ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml
index 31e4843..bda40d7 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"ಪಾವ್ ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"ಪಾವ್ ಮೋಡ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml
index 31e4843..ab16b8c 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw 모드 사용 설정"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw 모드 사용 중지"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml
index 31e4843..c22b73e 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw режими иштетилди"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw режими өчүрүлдү"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml
index 31e4843..66e863d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"ເປີດໂໝດ Paw ແລ້ວ"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"ປິດໂໝດ Paw ແລ້ວ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml
index 31e4843..8c9ecc4 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"„Paw“ režimas įgalintas"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"„Paw“ režimas išjungtas"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml
index 31e4843..2ecc5bb 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"PAW režīms iespējots"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"PAW režīms atspējots"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml
index 31e4843..d5e9640 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Овозможен е режим на фаќање"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Оневозможен е режим на фаќање"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml
index 31e4843..56ec689 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw മോഡ് പ്രവർത്തനക്ഷമമാക്കി"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw മോഡ് പ്രവർത്തനരഹിതമാക്കി"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml
index 31e4843..3a3e396 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw горимыг идэвхжүүлсэн"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw горимыг идэвхгүй болгосон"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml
index 31e4843..1f0c820 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw मोड सक्षम केला"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw मोड अक्षम केला"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml
index 31e4843..cfa6ed3 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Mod tapak kaki didayakan"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Mod tapak kaki dilumpuhkan"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml
index 31e4843..88a250b 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw မုဒ် ဖွင့်ထားသည်"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw မုဒ် ပိတ်ထားသည်"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml
index 31e4843..b71d3bd 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"PAW-modus er på"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"PAW-modus er av"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml
index 31e4843..3b6fd0f 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw मोड सक्षम पारियो"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw मोड असक्षम पारियो"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml
index 31e4843..9659c68 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw-modus ingeschakeld"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw-modus uitgeschakeld"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml
index 31e4843..b71d3bd 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"PAW-modus er på"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"PAW-modus er av"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml
index 31e4843..df7d616 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw ਮੋਡ ਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw ਮੋਡ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml
index 31e4843..a0a4276 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Tryb Paw włączony"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Tryb Paw wyłączony"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml
index 31e4843..71b3333 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modo PAW ativado"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modo PAW ativado"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml
index 31e4843..1ac61ce 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modo Paw ativado"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modo Paw desativado"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml
index 31e4843..71b3333 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modo PAW ativado"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modo PAW ativado"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
index 31e4843..d0ef36f 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modul Paw a fost activat"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modul Paw a fost dezactivat."</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
index 31e4843..913a362 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Режим PAW включен"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Режим PAW отключен"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml
index 31e4843..e3e9d65 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw ප්‍රකාරය සබල කෙ‍රිණි"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw ප්‍රකාරය අබල කෙරිණි"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml
index 31e4843..08ebf85 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Režim Paw bol aktivovaný"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Režim Paw bol deaktivovaný"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml
index 31e4843..4ce16ab 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Način PAW je omogočen"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Način PAW je onemogočen"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml
index 31e4843..39efd19 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Modaliteti Paw u aktivizua"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Modaliteti Paw u çaktivizua"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
index 31e4843..eb78565 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"PAW режим је омогућен"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"PAW режим је онемогућен"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml
index 31e4843..cbc8056 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw-läge aktiverat"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw-läge inaktiverat"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml
index 31e4843..e137b1d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Hali ya gusagusa imewashwa"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Hali ya gusagusa imezimwa"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml
index 31e4843..de00f02 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"பாவ் பயன்முறை இயக்கப்பட்டது"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"பாவ் பயன்முறை முடக்கப்பட்டது"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml
index 31e4843..a85038c 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw మోడ్ ప్రారంభించబడింది"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw మోడ్ నిలిపివేయబడింది"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml
index 31e4843..acc3ce9 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"เปิดโหมด Paw"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"ปิดโหมด Paw"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml
index 31e4843..4890180 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Naka-enable ang paw mode"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Naka-disable ang paw mode"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml
index 31e4843..6aaa71e 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"PAW modu etkinleştirildi"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"PAW modu devre dışı bırakıldı"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml
index 31e4843..a137510 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Paw-режим увімкнено"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Paw-режим вимкнено"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml
index 31e4843..a6c365f 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"‏Paw موڈ فعال ہے"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"‏Paw موڈ غیرفعال ہے"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml
index 31e4843..cbe9ef2 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"PAW rejimi yoniq"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"PAW rejimi o‘chiq"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml
index 31e4843..f860775 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Đã bật chế độ Paw"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Đã tắt chế độ Paw"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml
index 31e4843..2a6cbb1 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"已启用 Paw 模式"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"已停用 Paw 模式"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml
index 31e4843..90c9187 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"已啟用爪子模式"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"已停用爪子模式"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml
index 31e4843..3b86457 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"已啟用 Paw 模式"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"已停用 Paw 模式"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml
index 31e4843..a75c425 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for event_activated (4737012691463830969) -->
-    <skip />
-    <!-- no translation found for event_deactivated (4504516573331084650) -->
-    <skip />
+    <string name="event_activated" msgid="4737012691463830969">"Imodi ye-Paw inikwe amandla"</string>
+    <string name="event_deactivated" msgid="4504516573331084650">"Imodi ye-Paw ikhutshaziwe"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
index 073d3de..6ad8aaf 100644
--- a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
@@ -5,7 +5,7 @@
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"একটি অডিও কল হিসেবে উত্তর দিতে আইকন থেকে সোয়াইপ করুন"</string>
     <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"উত্তর দিতে এবং চালু থাকা কল হোল্ড করতে উপরের দিকে সোয়াইপ করুন"</string>
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"উত্তর দিতে এবং হোল্ডে থাকা কল কেটে দিতে উপরের দিকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"আগত কলের উত্তর দিতে এবং চালু থাকা কল কেটে দিতে আইকন থেকে সোয়াইপ করুন"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"ইনকামিং কলের উত্তর দিতে এবং চালু থাকা কল কেটে দিতে আইকন থেকে সোয়াইপ করুন"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"আপনার নিজের পছন্দ মত লিখুন…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"হ্যান্ডসেট"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"স্পিকারফোন"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"পাঠান"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"একটি বার্তা সহ এই কলটি প্রত্যাখ্যান করুন"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"অডিও কল হিসেবে উত্তর দিন"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"আগত কলের উত্তর এবং চালু থাকা কল কেটে দিন"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"ইনকামিং কলের উত্তর এবং চালু থাকা কল কেটে দিন"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"বার্তা সহ প্রত্যাখ্যান করুন"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"অডিও কল হিসেবে উত্তর দিন"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"আগত কলের উত্তর এবং চালু থাকা কল কেটে দিন"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"ইনকামিং কলের উত্তর এবং চালু থাকা কল কেটে দিন"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ভিডিও বন্ধ আছে"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"উত্তর দিতে উপরের দিকে, প্রত্যাখ্যান করতে নিচের দিকে দুই আঙুল দিয়ে সোয়াইপ করুন৷"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"গুরুত্বপূর্ণ কল"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
index f73aed7..7a9f1a8 100644
--- a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
@@ -3,8 +3,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Llisca des de la icona per rebutjar la trucada amb un missatge"</string>
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Llisca des de la icona per respondre amb una trucada d\'àudio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Llisca cap amunt per respondre a la trucada i mantenir en espera l\'actual"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Llisca cap amunt per respondre a la trucada i finalitzar l\'actual"</string>
+    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Llisca cap amunt per respondre a la trucada i posar l\'actual en espera"</string>
+    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Llisca cap amunt per respondre a la trucada i finalitzar la que està en espera"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Llisca des de la icona per respondre a la trucada entrant i finalitzar l\'actual"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escriu la teva…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Auricular"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/res/values-de/strings.xml
index 6ea77eb..d4cab75 100644
--- a/java/com/android/incallui/answer/impl/res/values-de/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-de/strings.xml
@@ -3,9 +3,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Zum Ablehnen mit Nachricht vom Symbol wegwischen"</string>
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Zum Annehmen als Sprachanruf vom Symbol wegwischen"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Nach oben wischen, um den Anruf anzunehmen und den laufenden Anruf zu halten"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Nach oben wischen, um den Anruf anzunehmen und den gehaltenen Anruf zu beenden"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Vom Symbol wegwischen, um den eingehenden Anruf anzunehmen und den laufenden Anruf zu beenden"</string>
+    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Wische nach oben, um den Anruf anzunehmen und den aktuellen Anruf zu halten"</string>
+    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Wische nach oben, um den Anruf anzunehmen und den gehaltenen Anruf zu beenden"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Wische vom Symbol weg, um den eingehenden Anruf anzunehmen und den aktuellen Anruf zu beenden"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Eigene Antwort schreiben…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Mobiltelefon"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Freisprechfunktion"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Senden"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Diesen Anruf mit einer Nachricht ablehnen"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Als Sprachanruf annehmen"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Eingehenden Anruf annehmen und laufenden Anruf beenden"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Nimm den eingehenden Anruf an und beende den aktuellen Anruf"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Mit Nachricht ablehnen"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Als Sprachanruf annehmen"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Eingehenden Anruf annehmen und laufenden Anruf beenden"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Nimm den eingehenden Anruf an und beende den aktuellen Anruf"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video deaktiviert"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Zum Annehmen mit zwei Fingern nach oben wischen. Zum Ablehnen mit zwei Fingern nach unten wischen."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Wichtiger Anruf"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/res/values-es/strings.xml
index fd80cf5..8b6c9fa 100644
--- a/java/com/android/incallui/answer/impl/res/values-es/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-es/strings.xml
@@ -3,9 +3,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Desliza desde el icono para rechazar con mensaje"</string>
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Desliza desde el icono para responder como una llamada de audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Desliza el dedo hacia arriba para responder a una llamada y para ponerla en espera"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Desliza el dedo hacia arriba para responder a una llamada y para finalizar una llamada en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Desliza el dedo desde el icono para responder a una llamada entrante y para finalizar una llamada"</string>
+    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Desliza el dedo hacia arriba para responder a una llamada y para poner en espera la llamada en curso"</string>
+    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Desliza el dedo hacia arriba para responder a una llamada y para finalizar la llamada en espera"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Desliza el dedo desde el icono para responder a una llamada entrante y para finalizar la llamada en curso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe tu propia respuesta…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Auricular"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altavoz"</string>
@@ -14,10 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rechaza esta llamada con un mensaje"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Responde como llamada de audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Responder a una llamada entrante y finalizar una llamada"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Responder a una llamada entrante y finalizar una llamada en curso"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rechaza con un mensaje"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Responde como llamada de audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Responder a una llamada entrante y finalizar una llamada"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Responder a una llamada entrante y finalizar una llamada en curso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El vídeo está desconectado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Desliza dos dedos hacia arriba para responder o hacia abajo para rechazar la llamada."</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"Llamada importante"</string>
diff --git a/java/com/android/incallui/answer/impl/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/res/values-th/strings.xml
index 4f5e320..6df7959 100644
--- a/java/com/android/incallui/answer/impl/res/values-th/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-th/strings.xml
@@ -3,8 +3,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"เลื่อนไอคอนเพื่อปฏิเสธสายด้วยข้อความ"</string>
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"เลื่อนไอคอนเพื่อรับสายเป็นการโทรด้วยเสียง"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"เลื่อนหน้าจอขึ้นเพื่อรับสายและพักสายปัจจุบัน"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"เลื่อนหน้าจอขึ้นเพื่อรับสายและวางสายที่พักไว้"</string>
+    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"เลื่อนขึ้นเพื่อรับและพักสายปัจจุบัน"</string>
+    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"เลื่อนขึ้นเพื่อรับและวางสายที่พักไว้"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"เลื่อนจากไอคอนเพื่อรับสายเรียกเข้าและวางสายปัจจุบัน"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"เขียนคำตอบของคุณเอง…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"มือถือ"</string>
diff --git a/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java b/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java
index 9b5335b..33e133d 100644
--- a/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java
+++ b/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java
@@ -21,9 +21,9 @@
 import android.os.Handler;
 import android.provider.CallLog;
 import android.support.annotation.NonNull;
-import com.android.dialer.common.AsyncTaskExecutor;
-import com.android.dialer.common.AsyncTaskExecutors;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.AsyncTaskExecutor;
+import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import java.util.Objects;
 
 /**
diff --git a/java/com/android/incallui/spam/NumberInCallHistoryTask.java b/java/com/android/incallui/spam/NumberInCallHistoryTask.java
index a225606..886933f 100644
--- a/java/com/android/incallui/spam/NumberInCallHistoryTask.java
+++ b/java/com/android/incallui/spam/NumberInCallHistoryTask.java
@@ -27,9 +27,9 @@
 import android.support.annotation.NonNull;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
-import com.android.dialer.common.AsyncTaskExecutor;
-import com.android.dialer.common.AsyncTaskExecutors;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.AsyncTaskExecutor;
+import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.call.DialerCall;
diff --git a/java/com/android/incallui/videotech/utils/SessionModificationState.java b/java/com/android/incallui/videotech/utils/SessionModificationState.java
index 24b0ca3..9272f8f 100644
--- a/java/com/android/incallui/videotech/utils/SessionModificationState.java
+++ b/java/com/android/incallui/videotech/utils/SessionModificationState.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
+
 package com.android.incallui.videotech.utils;
 
 import android.support.annotation.IntDef;